Merge branch 'master' into the-diffening

.travis.yml

@@ -1,4 +1,7 @@
 language: c
+os:
+  - linux
+  - osx
 install:
   - |-
     path="$(pwd)"; cd;
@@ -20,4 +23,3 @@ before_script:
 script:
   - make -j2 compare
   - check_status
-

FAQ.md

@@ -4,9 +4,12 @@
 ## Questions
 
 - [What is pokecrystal11.gbc?](#what-is-pokecrystal11gbc)
-- [Can't build ROM; "ERROR: `UNION` already defined"](#cant-build-rom-error-union-already-defined)
-- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx)
-- [Can't build ROM; "Section is too big" or "Unable to place section in bank"](#cant-build-rom-section-is-too-big-or-unable-to-place-section-in-bank)
+- [I can't build the ROM, `make` just prints an error!](#i-cant-build-the-rom-make-just-prints-an-error)
+  - [`gcc`: command not found](#gcc-command-not-found)
+  - ["ERROR: `UNION` already defined"](#error-union-already-defined)
+  - ["Segmentation fault" from `rgbgfx`](#segmentation-fault-from-rgbgfx)
+  - ["Section is too big" or "Unable to place section in bank"](#section-is-too-big-or-unable-to-place-section-in-bank)
+  - ["Invalid file or object file version"](#invalid-file-or-object-file-version)
 - [How do I edit maps?](#how-do-i-edit-maps)
 - [How do I write new features?](#how-do-i-write-new-features)
 - [I need more help!](#i-need-more-help)
@@ -17,31 +20,41 @@
 Version 1.1 of Pokémon Crystal, which fixed some issues with the initial international release. `make crystal11` defines `_CRYSTAL11` so the assembly builds the changed version.
 
 
-## Can't build ROM; "ERROR: `UNION` already defined"
+## I can't build the ROM, `make` just prints an error!
 
-Download [**rgbds 0.3.3**][rgbds]. Earlier versions will not work.
+Reread [INSTALL.md](INSTALL.md) carefully, and make sure you're following all its steps.
 
+### `gcc`: command not found
 
-## Can't build ROM; "Segmentation fault" from `rgbgfx`
+You need to install `gcc`. If you're using Cygwin, re-run its setup, and at "Select Packages", choose to install `gcc-core`.
+
+### "ERROR: `UNION` already defined"
+
+Download [the latest **rgbds** release][rgbds]. Versions earlier than 0.3.3 will not work.
+
+### "Segmentation fault" from `rgbgfx`
 
 If you are using 64-bit Windows, download [**64-bit Cygwin**][cygwin] and [**64-bit rgbds**][rgbds].
 
-
-## Can't build ROM; "Section is too big" or "Unable to place section in bank"
+### "Section is too big" or "Unable to place section in bank"
 
 If you have not changed any of the asm, make sure you have the latest version of pokecrystal and the correct version of rgbds (see [INSTALL.md](INSTALL.md)).
 
 If you added or changed any code, it has to fit in the **memory banks**. The 2MB ROM is divided into 128 banks of 4KB each, numbered $00 to $7F. The linkerscript **pokecrystal.link** lists which `SECTION`s go in which banks. Try moving some code into a new section.
 
+### "Invalid file or object file version"
+
+Run `make clean` to remove all the old `o` files, then re-run `make`.
+
 
 ## How do I edit maps?
 
-For `asm` scripts, read [docs/map_event_scripts.md](docs/map_event_scripts.md). For `blk` layouts, try [crowdmap][crowdmap] or [Polished Map][polished-map].
+For `asm` scripts, read [docs/map_event_scripts.md](docs/map_event_scripts.md). For `blk` layouts, try [Polished Map][polished-map] or [crowdmap][crowdmap].
 
 
 ## How do I write new features?
 
-There are a number of special-purpose scripting languages, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md).
+There are a number of special-purpose scripting languages, as described in [docs](docs/). For more general features, you'll need to code directly in assembly language. See [docs/assembly_programming.md](docs/assembly_programming.md). Some of the [tutorials][tutorials] may also be helpful.
 
 
 ## I need more help!
@@ -50,5 +63,6 @@ Try asking on IRC or Discord (see [README.md](README.md)).
 
 [cygwin]: https://cygwin.com/install.html
 [rgbds]: https://github.com/rednex/rgbds/releases
-[crowdmap]: https://github.com/yenatch/crowdmap/
 [polished-map]: https://github.com/Rangi42/polished-map
+[crowdmap]: https://github.com/yenatch/crowdmap/
+[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials

audio.asm

@@ -11,7 +11,6 @@ INCLUDE "audio/cry_pointers.asm"
 INCLUDE "audio/sfx_pointers.asm"
 
 
-
 SECTION "Songs 1", ROMX
 
 INCLUDE "audio/music/route36.asm"
@@ -130,7 +129,6 @@ INCLUDE "audio/music/battletowerlobby.asm"
 INCLUDE "audio/music/mobilecenter.asm"
 
 
-
 SECTION "Extra Songs 1", ROMX
 
 INCLUDE "audio/music/credits.asm"
@@ -143,7 +141,6 @@ SECTION "Extra Songs 2", ROMX
 INCLUDE "audio/music/postcredits.asm"
 
 
-
 SECTION "Sound Effects", ROMX
 
 INCLUDE "audio/sfx.asm"
@@ -154,7 +151,6 @@ SECTION "Crystal Sound Effects", ROMX
 INCLUDE "audio/sfx_crystal.asm"
 
 
-
 SECTION "Cries", ROMX
 
 INCLUDE "data/pokemon/cries.asm"

audio/cry_pointers.asm

@@ -1,4 +1,4 @@
-Cries: ; e91b0
+Cries:
 	dba Cry_Nidoran_M
 	dba Cry_Nidoran_F
 	dba Cry_Slowpoke
@@ -67,4 +67,3 @@ Cries: ; e91b0
 	dba Cry_Aipom
 	dba Cry_Dunsparce
 	dba Cry_Donphan
-; e927c

audio/drumkits.asm

@@ -1,13 +1,12 @@
-Drumkits: ; e8e52
+Drumkits:
 	dw Drumkit0
 	dw Drumkit1
 	dw Drumkit2
 	dw Drumkit3
 	dw Drumkit4
 	dw Drumkit5
-; e8e5e
 
-Drumkit0: ; e8e5e
+Drumkit0:
 	dw Drum00    ; rest
 	dw Snare1    ; c
 	dw Snare2    ; c#
@@ -21,7 +20,7 @@ Drumkit0: ; e8e5e
 	dw Snare6    ; a
 	dw Snare7    ; a#
 	dw HiHat2    ; b
-Drumkit1: ; e8e78
+Drumkit1:
 	dw Drum00
 	dw HiHat1
 	dw Snare5
@@ -35,7 +34,7 @@ Drumkit1: ; e8e78
 	dw Snare9
 	dw Snare10
 	dw Snare11
-Drumkit2: ; e8e92
+Drumkit2:
 	dw Drum00
 	dw Snare1
 	dw Snare9
@@ -49,7 +48,7 @@ Drumkit2: ; e8e92
 	dw Snare6
 	dw Snare7
 	dw HiHat2
-Drumkit3: ; e8eac
+Drumkit3:
 	dw Drum21
 	dw Snare12
 	dw Snare13
@@ -63,7 +62,7 @@ Drumkit3: ; e8eac
 	dw Drum21
 	dw Kick2
 	dw Crash2
-Drumkit4: ; e8ec6
+Drumkit4:
 	dw Drum21
 	dw Drum20
 	dw Snare13
@@ -77,7 +76,7 @@ Drumkit4: ; e8ec6
 	dw Drum36
 	dw Kick2
 	dw Crash1
-Drumkit5: ; e8ee0
+Drumkit5:
 	dw Drum00
 	dw Snare9
 	dw Snare10
@@ -91,35 +90,29 @@ Drumkit5: ; e8ee0
 	dw Snare14
 	dw Snare13
 	dw Kick2
-; e8efa
 
-Drum00: ; e8efa
+Drum00:
 ; unused
 	noise C#,  1, $11, $00
 	endchannel
-; e8efe
 
-Snare1: ; e8efe
+Snare1:
 	noise C#,  1, $c1, $33
 	endchannel
-; e8f02
 
-Snare2: ; e8f02
+Snare2:
 	noise C#,  1, $b1, $33
 	endchannel
-; e8f06
 
-Snare3: ; e8f06
+Snare3:
 	noise C#,  1, $a1, $33
 	endchannel
-; e8f0a
 
-Snare4: ; e8f0a
+Snare4:
 	noise C#,  1, $81, $33
 	endchannel
-; e8f0e
 
-Drum05: ; e8f0e
+Drum05:
 	noise C#,  8, $84, $37
 	noise C#,  7, $84, $36
 	noise C#,  6, $83, $35
@@ -127,175 +120,142 @@ Drum05: ; e8f0e
 	noise C#,  4, $82, $33
 	noise C#,  3, $81, $32
 	endchannel
-; e8f21
 
-Triangle1: ; e8f21
+Triangle1:
 	noise C#,  1, $51, $2a
 	endchannel
-; e8f25
 
-Triangle2: ; e8f25
+Triangle2:
 	noise C#,  2, $41, $2b
 	noise C#,  1, $61, $2a
 	endchannel
-; e8f2c
 
-HiHat1: ; e8f2c
+HiHat1:
 	noise C#,  1, $81, $10
 	endchannel
-; e8f30
 
-Snare5: ; e8f30
+Snare5:
 	noise C#,  1, $82, $23
 	endchannel
-; e8f34
 
-Snare6: ; e8f34
+Snare6:
 	noise C#,  1, $82, $25
 	endchannel
-; e8f38
 
-Snare7: ; e8f38
+Snare7:
 	noise C#,  1, $82, $26
 	endchannel
-; e8f3c
 
-HiHat2: ; e8f3c
+HiHat2:
 	noise C#,  1, $a1, $10
 	endchannel
-; e8f40
 
-HiHat3: ; e8f40
+HiHat3:
 	noise C#,  1, $a2, $11
 	endchannel
-; e8f44
 
-Snare8: ; e8f44
+Snare8:
 	noise C#,  1, $a2, $50
 	endchannel
-; e8f48
 
-Triangle3: ; e8f48
+Triangle3:
 	noise C#,  1, $a1, $18
 	noise C#,  1, $31, $33
 	endchannel
-; e8f4f
 
-Triangle4: ; e8f4f
+Triangle4:
 	noise C#,  3, $91, $28
 	noise C#,  1, $71, $18
 	endchannel
-; e8f56
 
-Snare9: ; e8f56
+Snare9:
 	noise C#,  1, $91, $22
 	endchannel
-; e8f5a
 
-Snare10: ; e8f5a
+Snare10:
 	noise C#,  1, $71, $22
 	endchannel
-; e8f5e
 
-Snare11: ; e8f5e
+Snare11:
 	noise C#,  1, $61, $22
 	endchannel
-; e8f62
 
-Drum20: ; e8f62
+Drum20:
 	noise C#,  1, $11, $11
 	endchannel
-; e8f66
 
-Drum21: ; e8f66
+Drum21:
 	endchannel
-; e8f67
 
-Snare12: ; e8f67
+Snare12:
 	noise C#,  1, $91, $33
 	endchannel
-; e8f6b
 
-Snare13: ; e8f6b
+Snare13:
 	noise C#,  1, $51, $32
 	endchannel
-; e8f6f
 
-Snare14: ; e8f6f
+Snare14:
 	noise C#,  1, $81, $31
 	endchannel
-; e8f73
 
-Kick1: ; e8f73
+Kick1:
 	noise C#,  1, $88, $6b
 	noise C#,  1, $71, $00
 	endchannel
-; e8f7a
 
-Triangle5: ; e8f7a
+Triangle5:
 	noise D_,  1, $91, $18
 	endchannel
-; e8f7e
 
-Drum27: ; e8f7e
+Drum27:
 	noise C#,  8, $92, $10
 	endchannel
-; e8f82
 
-Drum28: ; e8f82
+Drum28:
 	noise D_,  4, $91, $00
 	noise D_,  4, $11, $00
 	endchannel
-; e8f89
 
-Drum29: ; e8f89
+Drum29:
 	noise D_,  4, $91, $11
 	noise D_,  4, $11, $00
 	endchannel
-; e8f90
 
-Crash1: ; e8f90
+Crash1:
 	noise D_,  4, $88, $15
 	noise C#,  1, $65, $12
 	endchannel
-; e8f97
 
-Drum31: ; e8f97
+Drum31:
 	noise D_,  4, $51, $21
 	noise D_,  4, $11, $11
 	endchannel
-; e8f9e
 
-Drum32: ; e8f9e
+Drum32:
 	noise D_,  4, $51, $50
 	noise D_,  4, $11, $11
 	endchannel
-; e8fa5
 
-Drum33: ; e8fa5
+Drum33:
 	noise C#,  1, $a1, $31
 	endchannel
-; e8fa9
 
-Crash2: ; e8fa9
+Crash2:
 	noise C#,  1, $84, $12
 	endchannel
-; e8fad
 
-Drum35: ; e8fad
+Drum35:
 	noise D_,  4, $81, $00
 	noise D_,  4, $11, $00
 	endchannel
-; e8fb4
 
-Drum36: ; e8fb4
+Drum36:
 	noise D_,  4, $81, $21
 	noise D_,  4, $11, $11
 	endchannel
-; e8fbb
 
-Kick2: ; e8fbb
+Kick2:
 	noise C#,  1, $a8, $6b
 	noise C#,  1, $71, $00
 	endchannel
-; e8fc2

audio/engine.asm

@@ -6,7 +6,7 @@
 ; 	FadeMusic
 ; 	PlayStereoSFX
 
-_MapSetup_Sound_Off:: ; e8000
+_MapSetup_Sound_Off::
 ; restart sound operation
 ; clear all relevant hardware registers & wram
 	push hl
@@ -56,9 +56,7 @@ _MapSetup_Sound_Off:: ; e8000
 	pop hl
 	ret
 
-; e803d
-
-MusicFadeRestart: ; e803d
+MusicFadeRestart:
 ; restart but keep the music id to fade in to
 	ld a, [wMusicFadeID + 1]
 	push af
@@ -71,23 +69,17 @@ MusicFadeRestart: ; e803d
 	ld [wMusicFadeID + 1], a
 	ret
 
-; e8051
-
-MusicOn: ; e8051
+MusicOn:
 	ld a, 1
 	ld [wMusicPlaying], a
 	ret
 
-; e8057
-
-MusicOff: ; e8057
+MusicOff:
 	xor a
 	ld [wMusicPlaying], a
 	ret
 
-; e805c
-
-_UpdateSound:: ; e805c
+_UpdateSound::
 ; called once per frame
 	; no use updating audio if it's not playing
 	ld a, [wMusicPlaying]
@@ -216,9 +208,7 @@ _UpdateSound:: ; e805c
 	ld [rNR51], a
 	ret
 
-; e8125
-
-UpdateChannels: ; e8125
+UpdateChannels:
 	ld hl, .ChannelFnPtrs
 	ld a, [wCurChannel]
 	and $7
@@ -510,9 +500,7 @@ endr
 	ld [rNR44], a
 	ret
 
-; e82e7
-
-_CheckSFX: ; e82e7
+_CheckSFX:
 ; return carry if any sfx channels are active
 	ld hl, wChannel5Flags1
 	bit SOUND_CHANNEL_ON, [hl]
@@ -533,9 +521,7 @@ _CheckSFX: ; e82e7
 	scf
 	ret
 
-; e8307
-
-PlayDanger: ; e8307
+PlayDanger:
 	ld a, [wLowHealthAlarm]
 	bit DANGER_ON_F, a
 	ret z
@@ -595,23 +581,19 @@ PlayDanger: ; e8307
 	ld [wSoundOutput], a
 	ret
 
-; e8350
-
-DangerSoundHigh: ; e8350
+DangerSoundHigh:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $50 ; frequency: $750
 	db $87 ; restart sound
-; e8354
 
-DangerSoundLow: ; e8354
+DangerSoundLow:
 	db $80 ; duty 50%
 	db $e2 ; volume 14, envelope decrease sweep 2
 	db $ee ; frequency: $6ee
 	db $86 ; restart sound
-; e8358
 
-FadeMusic: ; e8358
+FadeMusic:
 ; fade music if applicable
 ; usage:
 ;	write to wMusicFade
@@ -723,9 +705,7 @@ FadeMusic: ; e8358
 	ld [wVolume], a
 	ret
 
-; e83d1
-
-LoadNote: ; e83d1
+LoadNote:
 	; wait for pitch wheel to finish
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -845,9 +825,7 @@ LoadNote: ; e83d1
 	ld [hl], a
 	ret
 
-; e8466
-
-HandleTrackVibrato: ; e8466
+HandleTrackVibrato:
 ; handle duty, cry pitch, and vibrato
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -964,9 +942,7 @@ HandleTrackVibrato: ; e8466
 .quit
 	ret
 
-; e84f9
-
-ApplyPitchWheel: ; e84f9
+ApplyPitchWheel:
 	; quit if pitch wheel inactive
 	ld hl, CHANNEL_FLAGS2
 	add hl, bc
@@ -1081,9 +1057,7 @@ ApplyPitchWheel: ; e84f9
 	set NOTE_DUTY_OVERRIDE, [hl]
 	ret
 
-; e858c
-
-HandleNoise: ; e858c
+HandleNoise:
 	; is noise sampling on?
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
@@ -1109,9 +1083,7 @@ HandleNoise: ; e858c
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e85af
-
-ReadNoiseSample: ; e85af
+ReadNoiseSample:
 ; sample struct:
 ;	[wx] [yy] [zz]
 ;	w: ? either 2 or 3
@@ -1161,9 +1133,7 @@ ReadNoiseSample: ; e85af
 .quit
 	ret
 
-; e85e1
-
-ParseMusic: ; e85e1
+ParseMusic:
 ; parses until a note is read or the song is ended
 	call GetMusicByte ; store next byte in a
 	cp $ff ; is the song over?
@@ -1271,9 +1241,7 @@ ParseMusic: ; e85e1
 	ld [hli], a ; bank
 	ret
 
-; e8679
-
-RestoreVolume: ; e8679
+RestoreVolume:
 	; ch5 only
 	ld a, [wCurChannel]
 	cp CHAN5
@@ -1292,9 +1260,7 @@ RestoreVolume: ; e8679
 	ld [wSFXPriority], a
 	ret
 
-; e8698
-
-ParseSFXOrRest: ; e8698
+ParseSFXOrRest:
 	; turn noise sampling on
 	ld hl, CHANNEL_NOTE_FLAGS
 	add hl, bc
@@ -1324,9 +1290,7 @@ ParseSFXOrRest: ; e8698
 	ld [hl], a
 	ret
 
-; e86c5
-
-GetNoiseSample: ; e86c5
+GetNoiseSample:
 ; load ptr to sample header in wNoiseSampleAddress
 	; are we on the last channel?
 	ld a, [wCurChannel]
@@ -1382,9 +1346,7 @@ GetNoiseSample: ; e86c5
 	ld [wNoiseSampleDelay], a
 	ret
 
-; e870f
-
-ParseMusicCommand: ; e870f
+ParseMusicCommand:
 	; reload command
 	ld a, [wCurMusicByte]
 	; get command #
@@ -1401,9 +1363,7 @@ ParseMusicCommand: ; e870f
 	ld l, a
 	jp hl
 
-; e8720
-
-MusicCommands: ; e8720
+MusicCommands:
 ; entries correspond to macros/sound.asm enumeration
 	dw Music_Octave8 ; octave 8
 	dw Music_Octave7 ; octave 7
@@ -1453,21 +1413,18 @@ MusicCommands: ; e8720
 	dw Music_LoopChannel ; loop
 	dw Music_CallChannel ; call
 	dw Music_EndChannel ; return
-; e8780
 
-MusicF1: ; e8780
-MusicF2: ; e8780
-MusicF3: ; e8780
-MusicF4: ; e8780
-MusicF5: ; e8780
-MusicF6: ; e8780
-MusicF7: ; e8780
-MusicF8: ; e8780
+MusicF1:
+MusicF2:
+MusicF3:
+MusicF4:
+MusicF5:
+MusicF6:
+MusicF7:
+MusicF8:
 	ret
 
-; e8781
-
-Music_EndChannel: ; e8781
+Music_EndChannel:
 ; called when $ff is encountered w/ subroutine flag set
 ; end music stream
 ; return to caller of the subroutine
@@ -1488,9 +1445,7 @@ Music_EndChannel: ; e8781
 	ld [hl], d
 	ret
 
-; e8796
-
-Music_CallChannel: ; e8796
+Music_CallChannel:
 ; call music stream (subroutine)
 ; parameters: ll hh ; pointer to subroutine
 	; get pointer from next 2 bytes
@@ -1523,9 +1478,7 @@ Music_CallChannel: ; e8796
 	set SOUND_SUBROUTINE, [hl]
 	ret
 
-; e87bc
-
-Music_JumpChannel: ; e87bc
+Music_JumpChannel:
 ; jump
 ; parameters: ll hh ; pointer
 	; get pointer from next 2 bytes
@@ -1540,9 +1493,7 @@ Music_JumpChannel: ; e87bc
 	ld [hl], d
 	ret
 
-; e87cc
-
-Music_LoopChannel: ; e87cc
+Music_LoopChannel:
 ; loops xx - 1 times
 ; 	00: infinite
 ; params: 3
@@ -1603,9 +1554,7 @@ Music_LoopChannel: ; e87cc
 	ld [hl], e
 	ret
 
-; e880e
-
-Music_SetCondition: ; e880e
+Music_SetCondition:
 ; set condition for a jump
 ; used with FB
 ; params: 1
@@ -1618,9 +1567,7 @@ Music_SetCondition: ; e880e
 	ld [hl], a
 	ret
 
-; e8817
-
-Music_JumpIf: ; e8817
+Music_JumpIf:
 ; conditional jump
 ; used with FA
 ; params: 3
@@ -1666,9 +1613,7 @@ Music_JumpIf: ; e8817
 	ld [hl], d
 	ret
 
-; e883e
-
-MusicEE; e883e
+MusicEE
 ; conditional jump
 ; checks a byte in ram corresponding to the current channel
 ; doesn't seem to be set by any commands
@@ -1720,9 +1665,7 @@ MusicEE; e883e
 	ld [hl], d
 	ret
 
-; e886d
-
-MusicF9: ; e886d
+MusicF9:
 ; sets some flag
 ; seems to be unused
 ; params: 0
@@ -1730,9 +1673,7 @@ MusicF9: ; e886d
 	ld [wc2b5], a
 	ret
 
-; e8873
-
-MusicE2: ; e8873
+MusicE2:
 ; seems to have been dummied out
 ; params: 1
 	call GetMusicByte
@@ -1744,9 +1685,7 @@ MusicE2: ; e8873
 	set SOUND_UNKN_0B, [hl]
 	ret
 
-; e8882
-
-Music_Vibrato: ; e8882
+Music_Vibrato:
 ; vibrato
 ; params: 2
 ;	1: [xx]
@@ -1801,9 +1740,7 @@ Music_Vibrato: ; e8882
 	ld [hl], a
 	ret
 
-; e88bd
-
-Music_SlidePitchTo: ; e88bd
+Music_SlidePitchTo:
 ; set the target for pitch wheel
 ; params: 2
 ; note duration
@@ -1834,9 +1771,7 @@ Music_SlidePitchTo: ; e88bd
 	set SOUND_PITCH_WHEEL, [hl]
 	ret
 
-; e88e4
-
-Music_Tone: ; e88e4
+Music_Tone:
 ; tone
 ; params: 1 (dw)
 	ld hl, CHANNEL_FLAGS2
@@ -1850,9 +1785,7 @@ Music_Tone: ; e88e4
 	ld [hl], a
 	ret
 
-; e88f7
-
-MusicE7: ; e88f7
+MusicE7:
 ; unused
 ; params: 1
 	ld hl, CHANNEL_FLAGS2
@@ -1864,9 +1797,7 @@ MusicE7: ; e88f7
 	ld [hl], a
 	ret
 
-; e8906
-
-Music_SoundDuty: ; e8906
+Music_SoundDuty:
 ; sequence of 4 duty cycles to be looped
 ; params: 1 (4 2-bit duty cycle arguments)
 	ld hl, CHANNEL_FLAGS2
@@ -1886,9 +1817,7 @@ Music_SoundDuty: ; e8906
 	ld [hl], a
 	ret
 
-; e891e
-
-MusicE8: ; e891e
+MusicE8:
 ; unused
 ; params: 1
 	ld hl, CHANNEL_FLAGS2
@@ -1900,9 +1829,7 @@ MusicE8: ; e891e
 	ld [hl], a
 	ret
 
-; e892d
-
-Music_ToggleSFX: ; e892d
+Music_ToggleSFX:
 ; toggle something
 ; params: none
 	ld hl, CHANNEL_FLAGS1
@@ -1916,9 +1843,7 @@ Music_ToggleSFX: ; e892d
 	set SOUND_SFX, [hl]
 	ret
 
-; e893b
-
-Music_ToggleNoise: ; e893b
+Music_ToggleNoise:
 ; toggle music noise sampling
 ; can't be used as a straight toggle since the param is not read from on->off
 ; params:
@@ -1940,9 +1865,7 @@ Music_ToggleNoise: ; e893b
 	ld [wMusicNoiseSampleSet], a
 	ret
 
-; e894f
-
-Music_SFXToggleNoise: ; e894f
+Music_SFXToggleNoise:
 ; toggle sfx noise sampling
 ; params:
 ;	on: 1
@@ -1963,9 +1886,7 @@ Music_SFXToggleNoise: ; e894f
 	ld [wSFXNoiseSampleSet], a
 	ret
 
-; e8963
-
-Music_NoteType: ; e8963
+Music_NoteType:
 ; note length
 ;	# frames per 16th note
 ; intensity: see Music_Intensity
@@ -1983,9 +1904,7 @@ Music_NoteType: ; e8963
 	call Music_Intensity
 	ret
 
-; e8977
-
-Music_SoundStatus: ; e8977
+Music_SoundStatus:
 ; update sound status
 ; params: 1
 	call GetMusicByte
@@ -1995,9 +1914,7 @@ Music_SoundStatus: ; e8977
 	set NOTE_UNKN_3, [hl]
 	ret
 
-; e8984
-
-Music_DutyCycle: ; e8984
+Music_DutyCycle:
 ; duty cycle
 ; params: 1
 	call GetMusicByte
@@ -2009,9 +1926,7 @@ Music_DutyCycle: ; e8984
 	ld [hl], a
 	ret
 
-; e8991
-
-Music_Intensity: ; e8991
+Music_Intensity:
 ; intensity
 ; params: 1
 ;	hi: pressure
@@ -2022,9 +1937,7 @@ Music_Intensity: ; e8991
 	ld [hl], a
 	ret
 
-; e899a
-
-Music_Tempo: ; e899a
+Music_Tempo:
 ; global tempo
 ; params: 2
 ;	de: tempo
@@ -2035,16 +1948,14 @@ Music_Tempo: ; e899a
 	call SetGlobalTempo
 	ret
 
-; e89a6
-
-Music_Octave8: ; e89a6
-Music_Octave7: ; e89a6
-Music_Octave6: ; e89a6
-Music_Octave5: ; e89a6
-Music_Octave4: ; e89a6
-Music_Octave3: ; e89a6
-Music_Octave2: ; e89a6
-Music_Octave1: ; e89a6
+Music_Octave8:
+Music_Octave7:
+Music_Octave6:
+Music_Octave5:
+Music_Octave4:
+Music_Octave3:
+Music_Octave2:
+Music_Octave1:
 ; set octave based on lo nybble of the command
 	ld hl, CHANNEL_OCTAVE
 	add hl, bc
@@ -2053,9 +1964,7 @@ Music_Octave1: ; e89a6
 	ld [hl], a
 	ret
 
-; e89b1
-
-Music_ForceOctave: ; e89b1
+Music_ForceOctave:
 ; set starting octave
 ; this forces all notes up by the starting octave
 ; params: 1
@@ -2065,9 +1974,7 @@ Music_ForceOctave: ; e89b1
 	ld [hl], a
 	ret
 
-; e89ba
-
-Music_StereoPanning: ; e89ba
+Music_StereoPanning:
 ; stereo panning
 ; params: 1
 	; stereo on?
@@ -2078,9 +1985,7 @@ Music_StereoPanning: ; e89ba
 	call GetMusicByte
 	ret
 
-; e89c5
-
-Music_Panning: ; e89c5
+Music_Panning:
 ; force panning
 ; params: 1
 	call SetLRTracks
@@ -2091,9 +1996,7 @@ Music_Panning: ; e89c5
 	ld [hl], a
 	ret
 
-; e89d2
-
-Music_Volume: ; e89d2
+Music_Volume:
 ; set volume
 ; params: 1
 ;	see Volume
@@ -2109,9 +2012,7 @@ Music_Volume: ; e89d2
 	ld [wVolume], a
 	ret
 
-; e89e1
-
-Music_TempoRelative: ; e89e1
+Music_TempoRelative:
 ; set global tempo to current channel tempo +/- param
 ; params: 1 signed
 	call GetMusicByte
@@ -2137,27 +2038,21 @@ Music_TempoRelative: ; e89e1
 	call SetGlobalTempo
 	ret
 
-; e89fd
-
-Music_SFXPriorityOn: ; e89fd
+Music_SFXPriorityOn:
 ; turn sfx priority on
 ; params: none
 	ld a, 1
 	ld [wSFXPriority], a
 	ret
 
-; e8a03
-
-Music_SFXPriorityOff: ; e8a03
+Music_SFXPriorityOff:
 ; turn sfx priority off
 ; params: none
 	xor a
 	ld [wSFXPriority], a
 	ret
 
-; e8a08
-
-Music_RestartChannel: ; e8a08
+Music_RestartChannel:
 ; restart current channel from channel header (same bank)
 ; params: 2 (5)
 ; ll hh: pointer to new channel header
@@ -2191,9 +2086,7 @@ Music_RestartChannel: ; e8a08
 	pop bc ; restore current channel
 	ret
 
-; e8a30
-
-Music_NewSong: ; e8a30
+Music_NewSong:
 ; new song
 ; params: 2
 ;	de: song id
@@ -2206,9 +2099,7 @@ Music_NewSong: ; e8a30
 	pop bc
 	ret
 
-; e8a3e
-
-GetMusicByte: ; e8a3e
+GetMusicByte:
 ; returns byte from current address in a
 ; advances to next byte in music data
 ; input: bc = start of current channel
@@ -2240,9 +2131,7 @@ GetMusicByte: ; e8a3e
 	ld a, [wCurMusicByte]
 	ret
 
-; e8a5d
-
-GetFrequency: ; e8a5d
+GetFrequency:
 ; generate frequency
 ; input:
 ; 	d: octave
@@ -2294,9 +2183,7 @@ GetFrequency: ; e8a5d
 	ld d, a
 	ret
 
-; e8a8d
-
-SetNoteDuration: ; e8a8d
+SetNoteDuration:
 ; input: a = note duration in 16ths
 	; store delay units in de
 	inc a
@@ -2335,9 +2222,7 @@ SetNoteDuration: ; e8a8d
 	ld [hl], d
 	ret
 
-; e8ab8
-
-.Multiply: ; e8ab8
+.Multiply:
 ; multiplies a and de
 ; adds the result to l
 ; stores the result in hl
@@ -2358,9 +2243,7 @@ SetNoteDuration: ; e8a8d
 	jr nz, .loop
 	ret
 
-; e8ac7
-
-SetGlobalTempo: ; e8ac7
+SetGlobalTempo:
 	push bc ; save current channel
 	; are we dealing with music or sfx?
 	ld a, [wCurChannel]
@@ -2389,9 +2272,7 @@ SetGlobalTempo: ; e8ac7
 	pop bc ; restore current channel
 	ret
 
-; e8b03
-
-Tempo: ; e8b03
+Tempo:
 ; input:
 ; 	de: note length
 	; update Tempo
@@ -2407,18 +2288,14 @@ Tempo: ; e8b03
 	ld [hl], a
 	ret
 
-; e8b11
-
-StartChannel: ; e8b11
+StartChannel:
 	call SetLRTracks
 	ld hl, CHANNEL_FLAGS1
 	add hl, bc
 	set SOUND_CHANNEL_ON, [hl] ; turn channel on
 	ret
 
-; e8b1b
-
-SetLRTracks: ; e8b1b
+SetLRTracks:
 ; set tracks for a the current channel to default
 ; seems to be redundant since this is overwritten by stereo data later
 	push de
@@ -2438,9 +2315,7 @@ SetLRTracks: ; e8b1b
 	pop de
 	ret
 
-; e8b30
-
-_PlayMusic:: ; e8b30
+_PlayMusic::
 ; load music
 	call MusicOff
 	ld hl, wMusicID
@@ -2482,9 +2357,7 @@ _PlayMusic:: ; e8b30
 	call MusicOn
 	ret
 
-; e8b79
-
-_PlayCry:: ; e8b79
+_PlayCry::
 ; Play cry de using parameters:
 ;	wCryPitch
 ;	wCryLength
@@ -2595,9 +2468,7 @@ _PlayCry:: ; e8b79
 	call MusicOn
 	ret
 
-; e8c04
-
-_PlaySFX:: ; e8c04
+_PlaySFX::
 ; clear channels if they aren't already
 	call MusicOff
 	ld hl, wChannel5Flags1
@@ -2696,9 +2567,7 @@ _PlaySFX:: ; e8c04
 	ld [wSFXPriority], a
 	ret
 
-; e8ca6
-
-PlayStereoSFX:: ; e8ca6
+PlayStereoSFX::
 ; play sfx de
 
 	call MusicOff
@@ -2799,9 +2668,7 @@ PlayStereoSFX:: ; e8ca6
 	call MusicOn
 	ret
 
-; e8d1b
-
-LoadChannel: ; e8d1b
+LoadChannel:
 ; prep channel for use
 ; input:
 ; 	de:
@@ -2845,9 +2712,7 @@ LoadChannel: ; e8d1b
 	ld [hl], a
 	ret
 
-; e8d5b
-
-ChannelInit: ; e8d5b
+ChannelInit:
 ; make sure channel is cleared
 ; set default tempo and note length in case nothing is loaded
 ; input:
@@ -2877,9 +2742,7 @@ ChannelInit: ; e8d5b
 	pop de
 	ret
 
-; e8d76
-
-LoadMusicByte:: ; e8d76
+LoadMusicByte::
 ; input:
 ;   de = current music address
 ; output:
@@ -2889,17 +2752,13 @@ LoadMusicByte:: ; e8d76
 	ld a, [wCurMusicByte]
 	ret
 
-; e8d80
-
-
 INCLUDE "audio/notes.asm"
 
 INCLUDE "audio/wave_samples.asm"
 
 INCLUDE "audio/drumkits.asm"
 
-
-GetLRTracks: ; e8fc2
+GetLRTracks:
 ; gets the default sound l/r channels
 ; stores mono/stereo table in hl
 	ld a, [wOptions]
@@ -2913,22 +2772,18 @@ GetLRTracks: ; e8fc2
 	ld hl, StereoTracks
 	ret
 
-; e8fd1
-
-MonoTracks: ; e8fd1
+MonoTracks:
 ; bit corresponds to track #
 ; hi: left channel
 ; lo: right channel
 	db $11, $22, $44, $88
-; e8fd5
 
-StereoTracks: ; e8fd5
+StereoTracks:
 ; made redundant
 ; seems to be modified on a per-song basis
 	db $11, $22, $44, $88
-; e8fd9
 
-ChannelPointers: ; e8fd9
+ChannelPointers:
 ; music channels
 	dw wChannel1
 	dw wChannel2
@@ -2939,9 +2794,8 @@ ChannelPointers: ; e8fd9
 	dw wChannel6
 	dw wChannel7
 	dw wChannel8
-; e8fe9
 
-ClearChannels:: ; e8fe9
+ClearChannels::
 ; runs ClearChannel for all 4 channels
 ; doesn't seem to be used, but functionally identical to MapSetup_Sound_Off
 	ld hl, rNR50
@@ -2958,9 +2812,7 @@ ClearChannels:: ; e8fe9
 	jr nz, .loop
 	ret
 
-; e8ffe
-
-ClearChannel: ; e8ffe
+ClearChannel:
 ; input: hl = beginning hw sound register (rNR10, rNR20, rNR30, rNR40)
 ; output: 00 00 80 00 80
 
@@ -2977,9 +2829,7 @@ ClearChannel: ; e8ffe
 	ld [hli], a ; rNR14, rNR24, rNR34, rNR44 ; restart sound (freq hi = 0)
 	ret
 
-; e900a
-
-PlayTrainerEncounterMusic:: ; e900a
+PlayTrainerEncounterMusic::
 ; input: e = trainer type
 	; turn fade off
 	xor a
@@ -2998,4 +2848,3 @@ PlayTrainerEncounterMusic:: ; e900a
 	ld e, [hl]
 	call PlayMusic
 	ret
-; e9027

audio/music/aftertherivalfight.asm

@@ -1,11 +1,10 @@
-Music_AfterTheRivalFight: ; f5127
+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
-; f5133
 
-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,4 +62,3 @@ Music_AfterTheRivalFight_Ch4: ; f517a
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_AfterTheRivalFight_branch_f5118
-; f518a

audio/music/azaleatown.asm

@@ -1,18 +1,17 @@
-Music_AzaleaTown: ; f57e8
+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
-; f57f4
 
-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,4 +651,3 @@ Music_AzaleaTown_branch_f5aea: ; f5aea
 	note D_, 2
 	note F#, 2
 	loopchannel 0, Music_AzaleaTown_branch_f5aea
-; f5b03

audio/music/battletowerlobby.asm

@@ -1,11 +1,10 @@
-Music_BattleTowerLobby: ; 17948b
+Music_BattleTowerLobby:
 	musicheader 4, 1, Music_BattleTowerLobby_Ch1
 	musicheader 1, 2, Music_BattleTowerLobby_Ch2
 	musicheader 1, 3, Music_BattleTowerLobby_Ch3
 	musicheader 1, 4, Music_BattleTowerLobby_Ch4
-; 179497
 
-Music_BattleTowerLobby_Ch1: ; 179497
+Music_BattleTowerLobby_Ch1:
 	tempo 152
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_BattleTowerLobby_Ch1: ; 179497
 	vibrato $8, $22
 	stereopanning $f0
 	notetype $c, $72
-Music_BattleTowerLobby_branch_1794a9: ; 1794a9
+Music_BattleTowerLobby_branch_1794a9:
 	notetype $c, $72
 	octave 3
 	note G#, 2
@@ -116,14 +115,13 @@ Music_BattleTowerLobby_branch_1794a9: ; 1794a9
 	octave 2
 	note B_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_1794a9
-; 17953a
 
-Music_BattleTowerLobby_Ch2: ; 17953a
+Music_BattleTowerLobby_Ch2:
 	dutycycle $2
 	vibrato $10, $34
 	stereopanning $f
 	notetype $c, $82
-Music_BattleTowerLobby_branch_179544: ; 179544
+Music_BattleTowerLobby_branch_179544:
 	notetype $c, $82
 	octave 4
 	note E_, 2
@@ -201,11 +199,10 @@ Music_BattleTowerLobby_branch_179544: ; 179544
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_BattleTowerLobby_branch_179544
-; 1795ae
 
-Music_BattleTowerLobby_Ch3: ; 1795ae
+Music_BattleTowerLobby_Ch3:
 	notetype $c, $11
-Music_BattleTowerLobby_branch_1795b1: ; 1795b1
+Music_BattleTowerLobby_branch_1795b1:
 	octave 2
 	note B_, 2
 	octave 3
@@ -298,11 +295,10 @@ Music_BattleTowerLobby_branch_1795b1: ; 1795b1
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_BattleTowerLobby_branch_1795b1
-; 179610
 
-Music_BattleTowerLobby_Ch4: ; 179610
+Music_BattleTowerLobby_Ch4:
 	togglenoise $0
-Music_BattleTowerLobby_branch_179612: ; 179612
+Music_BattleTowerLobby_branch_179612:
 	notetype $c
 	note __, 2
 	note F_, 4
@@ -310,4 +306,3 @@ Music_BattleTowerLobby_branch_179612: ; 179612
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_BattleTowerLobby_branch_179612
-; 17961d

audio/music/battletowertheme.asm

@@ -1,18 +1,17 @@
-Music_BattleTowerTheme: ; 178889
+Music_BattleTowerTheme:
 	musicheader 4, 1, Music_BattleTowerTheme_Ch1
 	musicheader 1, 2, Music_BattleTowerTheme_Ch2
 	musicheader 1, 3, Music_BattleTowerTheme_Ch3
 	musicheader 1, 4, Music_BattleTowerTheme_Ch4
-; 178895
 
-Music_BattleTowerTheme_Ch1: ; 178895
+Music_BattleTowerTheme_Ch1:
 	tempo 141
 	volume $77
 	tone $0001
 	vibrato $12, $34
 	stereopanning $f
 	notetype $6, $94
-Music_BattleTowerTheme_branch_1788a5: ; 1788a5
+Music_BattleTowerTheme_branch_1788a5:
 	note __, 16
 	note __, 16
 	note __, 12
@@ -185,9 +184,8 @@ Music_BattleTowerTheme_branch_1788a5: ; 1788a5
 	note E_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_1788a5
-; 17895e
 
-Music_BattleTowerTheme_branch_17895e: ; 17895e
+Music_BattleTowerTheme_branch_17895e:
 	intensity $94
 	note A_, 2
 	note __, 2
@@ -202,11 +200,10 @@ Music_BattleTowerTheme_branch_17895e: ; 17895e
 	note __, 4
 	note A_, 4
 	endchannel
-; 17896d
 
-Music_BattleTowerTheme_Ch2: ; 17896d
+Music_BattleTowerTheme_Ch2:
 	vibrato $12, $34
-Music_BattleTowerTheme_branch_178970: ; 178970
+Music_BattleTowerTheme_branch_178970:
 	dutycycle $3
 	notetype $6, $b8
 	octave 3
@@ -345,9 +342,8 @@ Music_BattleTowerTheme_branch_178970: ; 178970
 	note D_, 2
 	note E_, 4
 	loopchannel 0, Music_BattleTowerTheme_branch_178970
-; 178a15
 
-Music_BattleTowerTheme_branch_178a15: ; 178a15
+Music_BattleTowerTheme_branch_178a15:
 	note F_, 2
 	note __, 2
 	note F_, 8
@@ -359,12 +355,11 @@ Music_BattleTowerTheme_branch_178a15: ; 178a15
 	note A#, 4
 	note A_, 4
 	endchannel
-; 178a20
 
-Music_BattleTowerTheme_Ch3: ; 178a20
+Music_BattleTowerTheme_Ch3:
 	vibrato $12, $34
 	notetype $6, $16
-Music_BattleTowerTheme_branch_178a26: ; 178a26
+Music_BattleTowerTheme_branch_178a26:
 	stereopanning $ff
 	callchannel Music_BattleTowerTheme_branch_178afe
 	note C_, 2
@@ -569,9 +564,8 @@ Music_BattleTowerTheme_branch_178a26: ; 178a26
 	note G_, 4
 	note __, 12
 	loopchannel 0, Music_BattleTowerTheme_branch_178a26
-; 178afe
 
-Music_BattleTowerTheme_branch_178afe: ; 178afe
+Music_BattleTowerTheme_branch_178afe:
 	octave 3
 	note C_, 2
 	note __, 2
@@ -587,12 +581,11 @@ Music_BattleTowerTheme_branch_178afe: ; 178afe
 	note C_, 2
 	note __, 2
 	endchannel
-; 178b0d
 
-Music_BattleTowerTheme_Ch4: ; 178b0d
+Music_BattleTowerTheme_Ch4:
 	togglenoise $3
 	notetype $c
-Music_BattleTowerTheme_branch_178b11: ; 178b11
+Music_BattleTowerTheme_branch_178b11:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	note D_, 2
 	note D_, 4
@@ -603,7 +596,7 @@ Music_BattleTowerTheme_branch_178b11: ; 178b11
 	note C#, 1
 	note D_, 1
 	note C#, 1
-Music_BattleTowerTheme_branch_178b1d: ; 178b1d
+Music_BattleTowerTheme_branch_178b1d:
 	callchannel Music_BattleTowerTheme_branch_178b58
 	callchannel Music_BattleTowerTheme_branch_178b61
 	loopchannel 2, Music_BattleTowerTheme_branch_178b1d
@@ -615,7 +608,7 @@ Music_BattleTowerTheme_branch_178b1d: ; 178b1d
 	note D_, 1
 	note D_, 1
 	note D_, 8
-Music_BattleTowerTheme_branch_178b35: ; 178b35
+Music_BattleTowerTheme_branch_178b35:
 	callchannel Music_BattleTowerTheme_branch_178b76
 	note D_, 2
 	note D_, 2
@@ -641,9 +634,8 @@ Music_BattleTowerTheme_branch_178b35: ; 178b35
 	note D_, 1
 	note C#, 1
 	loopchannel 0, Music_BattleTowerTheme_branch_178b11
-; 178b58
 
-Music_BattleTowerTheme_branch_178b58: ; 178b58
+Music_BattleTowerTheme_branch_178b58:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -653,9 +645,8 @@ Music_BattleTowerTheme_branch_178b58: ; 178b58
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b61
 
-Music_BattleTowerTheme_branch_178b61: ; 178b61
+Music_BattleTowerTheme_branch_178b61:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -667,9 +658,8 @@ Music_BattleTowerTheme_branch_178b61: ; 178b61
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b6c
 
-Music_BattleTowerTheme_branch_178b6c: ; 178b6c
+Music_BattleTowerTheme_branch_178b6c:
 	note D_, 2
 	note D_, 4
 	note D_, 1
@@ -680,9 +670,8 @@ Music_BattleTowerTheme_branch_178b6c: ; 178b6c
 	note D_, 1
 	note D_, 1
 	endchannel
-; 178b76
 
-Music_BattleTowerTheme_branch_178b76: ; 178b76
+Music_BattleTowerTheme_branch_178b76:
 	note D_, 2
 	note C#, 2
 	note D_, 2
@@ -694,4 +683,3 @@ Music_BattleTowerTheme_branch_178b76: ; 178b76
 	note D_, 1
 	note C#, 1
 	endchannel
-; 178b81

audio/music/bicycle.asm

@@ -1,11 +1,10 @@
-Music_Bicycle: ; ee119
+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
-; ee125
 
-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,4 +512,3 @@ Music_Bicycle_branch_ee34c: ; ee34c
 	note F_, 2
 	note F_, 2
 	loopchannel 0, Music_Bicycle_branch_ee34b
-; ee35e

audio/music/buenaspassword.asm

@@ -1,17 +1,16 @@
-Music_BuenasPassword: ; 178153
+Music_BuenasPassword:
 	musicheader 4, 1, Music_BuenasPassword_Ch1
 	musicheader 1, 2, Music_BuenasPassword_Ch2
 	musicheader 1, 3, Music_BuenasPassword_Ch3
 	musicheader 1, 4, Music_BuenasPassword_Ch4
-; 17815f
 
-Music_BuenasPassword_Ch1: ; 17815f
+Music_BuenasPassword_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
 	notetype $c, $b3
 	note __, 8
-Music_BuenasPassword_branch_17816b: ; 17816b
+Music_BuenasPassword_branch_17816b:
 	stereopanning $ff
 	note __, 16
 	note __, 16
@@ -138,9 +137,8 @@ Music_BuenasPassword_branch_17816b: ; 17816b
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_17816b
-; 178204
 
-Music_BuenasPassword_branch_178204: ; 178204
+Music_BuenasPassword_branch_178204:
 	stereopanning $f
 	notetype $6, $84
 	octave 4
@@ -162,9 +160,8 @@ Music_BuenasPassword_branch_178204: ; 178204
 	note __, 1
 	notetype $c, $84
 	endchannel
-; 178222
 
-Music_BuenasPassword_branch_178222: ; 178222
+Music_BuenasPassword_branch_178222:
 	octave 3
 	note D#, 1
 	note __, 1
@@ -180,16 +177,15 @@ Music_BuenasPassword_branch_178222: ; 178222
 	note D#, 1
 	note __, 2
 	endchannel
-; 178231
 
-Music_BuenasPassword_Ch2: ; 178231
+Music_BuenasPassword_Ch2:
 	vibrato $12, $34
 	dutycycle $2
 	notetype $c, $a5
 	note __, 7
 	octave 3
 	note F#, 1
-Music_BuenasPassword_branch_17823c: ; 17823c
+Music_BuenasPassword_branch_17823c:
 	stereopanning $ff
 	callchannel Music_BuenasPassword_branch_1782df
 	callchannel Music_BuenasPassword_branch_1782a4
@@ -274,9 +270,8 @@ Music_BuenasPassword_branch_17823c: ; 17823c
 	note __, 1
 	intensity $a5
 	loopchannel 0, Music_BuenasPassword_branch_17823c
-; 1782a4
 
-Music_BuenasPassword_branch_1782a4: ; 1782a4
+Music_BuenasPassword_branch_1782a4:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -308,9 +303,8 @@ Music_BuenasPassword_branch_1782a4: ; 1782a4
 	note __, 1
 	notetype $c, $a5
 	endchannel
-; 1782cc
 
-Music_BuenasPassword_branch_1782cc: ; 1782cc
+Music_BuenasPassword_branch_1782cc:
 	octave 4
 	note G#, 2
 	note __, 2
@@ -330,9 +324,8 @@ Music_BuenasPassword_branch_1782cc: ; 1782cc
 	note D#, 2
 	note __, 2
 	endchannel
-; 1782df
 
-Music_BuenasPassword_branch_1782df: ; 1782df
+Music_BuenasPassword_branch_1782df:
 	octave 3
 	note G#, 1
 	note __, 1
@@ -383,12 +376,11 @@ Music_BuenasPassword_branch_1782df: ; 1782df
 	note B_, 1
 	note G#, 3
 	endchannel
-; 178311
 
-Music_BuenasPassword_Ch3: ; 178311
+Music_BuenasPassword_Ch3:
 	notetype $c, $14
 	note __, 8
-Music_BuenasPassword_branch_178315: ; 178315
+Music_BuenasPassword_branch_178315:
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
 	callchannel Music_BuenasPassword_branch_1783a7
@@ -519,9 +511,8 @@ Music_BuenasPassword_branch_178315: ; 178315
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_BuenasPassword_branch_178315
-; 1783a7
 
-Music_BuenasPassword_branch_1783a7: ; 1783a7
+Music_BuenasPassword_branch_1783a7:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -543,9 +534,8 @@ Music_BuenasPassword_branch_1783a7: ; 1783a7
 	note F_, 2
 	note C#, 1
 	endchannel
-; 1783bc
 
-Music_BuenasPassword_branch_1783bc: ; 1783bc
+Music_BuenasPassword_branch_1783bc:
 	octave 2
 	note G#, 1
 	note __, 1
@@ -566,9 +556,8 @@ Music_BuenasPassword_branch_1783bc: ; 1783bc
 	octave 2
 	note G#, 2
 	endchannel
-; 1783d0
 
-Music_BuenasPassword_Ch4: ; 1783d0
+Music_BuenasPassword_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -576,7 +565,7 @@ Music_BuenasPassword_Ch4: ; 1783d0
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_BuenasPassword_branch_1783d9: ; 1783d9
+Music_BuenasPassword_branch_1783d9:
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
 	callchannel Music_BuenasPassword_branch_17840c
@@ -602,9 +591,8 @@ Music_BuenasPassword_branch_1783d9: ; 1783d9
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_BuenasPassword_branch_1783d9
-; 17840c
 
-Music_BuenasPassword_branch_17840c: ; 17840c
+Music_BuenasPassword_branch_17840c:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -622,9 +610,8 @@ Music_BuenasPassword_branch_17840c: ; 17840c
 	stereopanning $f
 	note G_, 2
 	endchannel
-; 178424
 
-Music_BuenasPassword_branch_178424: ; 178424
+Music_BuenasPassword_branch_178424:
 	stereopanning $ff
 	note D#, 2
 	stereopanning $f0
@@ -642,4 +629,3 @@ Music_BuenasPassword_branch_178424: ; 178424
 	note D_, 1
 	note D_, 1
 	endchannel
-; 17843b

audio/music/bugcatchingcontest.asm

@@ -1,11 +1,10 @@
-Music_BugCatchingContest: ; f7c16
+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
-; f7c22
 
-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,4 +665,3 @@ Music_BugCatchingContest_branch_f7ee2: ; f7ee2
 	note D_, 2
 	note D_, 2
 	endchannel
-; f7ef3

audio/music/burnedtower.asm

@@ -1,11 +1,10 @@
-Music_BurnedTower: ; f6a99
+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
-; f6aa5
 
-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,4 +257,3 @@ Music_BurnedTower_branch_f6be7: ; f6be7
 	note G#, 2
 	note G_, 4
 	loopchannel 0, Music_BurnedTower_branch_f6be7
-; f6bf2

audio/music/celadoncity.asm

@@ -1,14 +1,13 @@
-Music_CeladonCity: ; f435b
+Music_CeladonCity:
 	musicheader 3, 1, Music_CeladonCity_Ch1
 	musicheader 1, 2, Music_CeladonCity_Ch2
 	musicheader 1, 3, Music_CeladonCity_Ch3
-; f4364
 
-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,4 +383,3 @@ Music_CeladonCity_branch_f4510: ; f4510
 	note A_, 2
 	note B_, 2
 	endchannel
-; f4518

audio/music/championbattle.asm

@@ -1,10 +1,9 @@
-Music_ChampionBattle: ; ea9c1
+Music_ChampionBattle:
 	musicheader 3, 1, Music_ChampionBattle_Ch1
 	musicheader 1, 2, Music_ChampionBattle_Ch2
 	musicheader 1, 3, Music_ChampionBattle_Ch3
-; ea9ca
 
-Music_ChampionBattle_Ch1: ; ea9ca
+Music_ChampionBattle_Ch1:
 	tempo 98
 	volume $77
 	dutycycle $3
@@ -18,7 +17,7 @@ Music_ChampionBattle_Ch1: ; ea9ca
 	note A#, 4
 	intensity $b7
 	note B_, 4
-Music_ChampionBattle_branch_ea9e2: ; ea9e2
+Music_ChampionBattle_branch_ea9e2:
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note D#, 4
@@ -26,11 +25,11 @@ Music_ChampionBattle_branch_ea9e2: ; ea9e2
 	callchannel Music_ChampionBattle_branch_eaaee
 	octave 3
 	note E_, 4
-Music_ChampionBattle_branch_ea9f0: ; ea9f0
+Music_ChampionBattle_branch_ea9f0:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 3, Music_ChampionBattle_branch_ea9f0
 	callchannel Music_ChampionBattle_branch_eab06
-Music_ChampionBattle_branch_ea9fa: ; ea9fa
+Music_ChampionBattle_branch_ea9fa:
 	callchannel Music_ChampionBattle_branch_eaafc
 	loopchannel 7, Music_ChampionBattle_branch_ea9fa
 	callchannel Music_ChampionBattle_branch_eab06
@@ -73,13 +72,13 @@ Music_ChampionBattle_branch_ea9fa: ; ea9fa
 	octave 4
 	note C_, 1
 	note C#, 1
-Music_ChampionBattle_branch_eaa35: ; eaa35
+Music_ChampionBattle_branch_eaa35:
 	callchannel Music_ChampionBattle_branch_eab0f
 	note E_, 2
 	note E_, 2
 	intensity $b7
 	note F#, 4
-Music_ChampionBattle_branch_eaa3d: ; eaa3d
+Music_ChampionBattle_branch_eaa3d:
 	intensity $b2
 	note E_, 2
 	note E_, 2
@@ -167,7 +166,7 @@ Music_ChampionBattle_branch_eaa3d: ; eaa3d
 	intensity $90
 	note D#, 16
 	note C#, 16
-Music_ChampionBattle_branch_eaab1: ; eaab1
+Music_ChampionBattle_branch_eaab1:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -176,7 +175,7 @@ Music_ChampionBattle_branch_eaab1: ; eaab1
 	octave 3
 	note D#, 4
 	loopchannel 4, Music_ChampionBattle_branch_eaab1
-Music_ChampionBattle_branch_eaabe: ; eaabe
+Music_ChampionBattle_branch_eaabe:
 	intensity $b2
 	note C_, 2
 	note C_, 2
@@ -207,9 +206,8 @@ Music_ChampionBattle_branch_eaabe: ; eaabe
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_ChampionBattle_branch_eaa35
-; eaaee
 
-Music_ChampionBattle_branch_eaaee: ; eaaee
+Music_ChampionBattle_branch_eaaee:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -222,9 +220,8 @@ Music_ChampionBattle_branch_eaaee: ; eaaee
 	note A#, 2
 	intensity $b7
 	endchannel
-; eaafc
 
-Music_ChampionBattle_branch_eaafc: ; eaafc
+Music_ChampionBattle_branch_eaafc:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -233,9 +230,8 @@ Music_ChampionBattle_branch_eaafc: ; eaafc
 	octave 3
 	note D#, 4
 	endchannel
-; eab06
 
-Music_ChampionBattle_branch_eab06: ; eab06
+Music_ChampionBattle_branch_eab06:
 	intensity $b2
 	octave 2
 	note A#, 2
@@ -243,9 +239,8 @@ Music_ChampionBattle_branch_eab06: ; eab06
 	intensity $b7
 	note B_, 4
 	endchannel
-; eab0f
 
-Music_ChampionBattle_branch_eab0f: ; eab0f
+Music_ChampionBattle_branch_eab0f:
 	intensity $b5
 	octave 3
 	note D#, 2
@@ -265,9 +260,8 @@ Music_ChampionBattle_branch_eab0f: ; eab0f
 	note G_, 2
 	intensity $b2
 	endchannel
-; eab24
 
-Music_ChampionBattle_branch_eab24: ; eab24
+Music_ChampionBattle_branch_eab24:
 	intensity $b2
 	octave 3
 	note A#, 2
@@ -279,9 +273,8 @@ Music_ChampionBattle_branch_eab24: ; eab24
 	note A#, 2
 	intensity $b7
 	endchannel
-; eab31
 
-Music_ChampionBattle_branch_eab31: ; eab31
+Music_ChampionBattle_branch_eab31:
 	intensity $b2
 	note D#, 2
 	note D#, 2
@@ -300,9 +293,8 @@ Music_ChampionBattle_branch_eab31: ; eab31
 	note C#, 4
 	intensity $b2
 	endchannel
-; eab4a
 
-Music_ChampionBattle_Ch2: ; eab4a
+Music_ChampionBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -357,7 +349,7 @@ Music_ChampionBattle_Ch2: ; eab4a
 	note E_, 8
 	intensity $3c
 	note E_, 8
-Music_ChampionBattle_branch_eab9d: ; eab9d
+Music_ChampionBattle_branch_eab9d:
 	intensity $c5
 	note D#, 6
 	octave 3
@@ -425,7 +417,7 @@ Music_ChampionBattle_branch_eab9d: ; eab9d
 	note F_, 16
 	note F#, 16
 	intensity $c4
-Music_ChampionBattle_branch_eabef: ; eabef
+Music_ChampionBattle_branch_eabef:
 	octave 5
 	note D#, 4
 	note D_, 4
@@ -498,9 +490,8 @@ Music_ChampionBattle_branch_eabef: ; eabef
 	note F#, 8
 	note G#, 8
 	loopchannel 0, Music_ChampionBattle_branch_eab9d
-; eac4f
 
-Music_ChampionBattle_branch_eac4f: ; eac4f
+Music_ChampionBattle_branch_eac4f:
 	intensity $c2
 	note D#, 2
 	note D#, 6
@@ -512,9 +503,8 @@ Music_ChampionBattle_branch_eac4f: ; eac4f
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac5c
 
-Music_ChampionBattle_branch_eac5c: ; eac5c
+Music_ChampionBattle_branch_eac5c:
 	intensity $c2
 	octave 3
 	note D#, 2
@@ -536,9 +526,8 @@ Music_ChampionBattle_branch_eac5c: ; eac5c
 	note D#, 2
 	intensity $c7
 	endchannel
-; eac79
 
-Music_ChampionBattle_branch_eac79: ; eac79
+Music_ChampionBattle_branch_eac79:
 	intensity $c1
 	note D#, 2
 	note D#, 4
@@ -549,11 +538,10 @@ Music_ChampionBattle_branch_eac79: ; eac79
 	note D#, 2
 	intensity $c5
 	endchannel
-; eac85
 
-Music_ChampionBattle_Ch3: ; eac85
+Music_ChampionBattle_Ch3:
 	notetype $c, $14
-Music_ChampionBattle_branch_eac88: ; eac88
+Music_ChampionBattle_branch_eac88:
 	octave 3
 	note D#, 1
 	note __, 7
@@ -601,11 +589,11 @@ Music_ChampionBattle_branch_eac88: ; eac88
 	note A#, 2
 	note F_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacc6: ; eacc6
+Music_ChampionBattle_branch_eacc6:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacc6
-Music_ChampionBattle_branch_eaccc: ; eaccc
+Music_ChampionBattle_branch_eaccc:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_eaccc
@@ -617,11 +605,11 @@ Music_ChampionBattle_branch_eaccc: ; eaccc
 	note B_, 2
 	note G_, 2
 	note A_, 2
-Music_ChampionBattle_branch_eacda: ; eacda
+Music_ChampionBattle_branch_eacda:
 	note D#, 2
 	note A#, 2
 	loopchannel 8, Music_ChampionBattle_branch_eacda
-Music_ChampionBattle_branch_eace0: ; eace0
+Music_ChampionBattle_branch_eace0:
 	note E_, 2
 	note B_, 2
 	loopchannel 8, Music_ChampionBattle_branch_eace0
@@ -652,7 +640,7 @@ Music_ChampionBattle_branch_eace0: ; eace0
 	note D#, 8
 	note B_, 8
 	note D#, 8
-Music_ChampionBattle_branch_ead05: ; ead05
+Music_ChampionBattle_branch_ead05:
 	note D#, 2
 	note F#, 2
 	loopchannel 16, Music_ChampionBattle_branch_ead05
@@ -670,12 +658,12 @@ Music_ChampionBattle_branch_ead05: ; ead05
 	note D#, 2
 	note E_, 2
 	callchannel Music_ChampionBattle_branch_ead8e
-Music_ChampionBattle_branch_ead1d: ; ead1d
+Music_ChampionBattle_branch_ead1d:
 	octave 3
 	note E_, 2
 	note B_, 2
 	loopchannel 4, Music_ChampionBattle_branch_ead1d
-Music_ChampionBattle_branch_ead24: ; ead24
+Music_ChampionBattle_branch_ead24:
 	note D#, 2
 	note A#, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead24
@@ -687,7 +675,7 @@ Music_ChampionBattle_branch_ead24: ; ead24
 	note __, 2
 	note D#, 2
 	note __, 2
-Music_ChampionBattle_branch_ead32: ; ead32
+Music_ChampionBattle_branch_ead32:
 	note E_, 2
 	note B_, 2
 	loopchannel 5, Music_ChampionBattle_branch_ead32
@@ -699,17 +687,17 @@ Music_ChampionBattle_branch_ead32: ; ead32
 	note __, 2
 	note E_, 2
 	note __, 2
-Music_ChampionBattle_branch_ead40: ; ead40
+Music_ChampionBattle_branch_ead40:
 	note D#, 2
 	note G#, 2
 	loopchannel 8, Music_ChampionBattle_branch_ead40
-Music_ChampionBattle_branch_ead46: ; ead46
+Music_ChampionBattle_branch_ead46:
 	note D#, 2
 	note A#, 2
 	loopchannel 7, Music_ChampionBattle_branch_ead46
 	note B_, 2
 	note A#, 2
-Music_ChampionBattle_branch_ead4e: ; ead4e
+Music_ChampionBattle_branch_ead4e:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -723,9 +711,8 @@ Music_ChampionBattle_branch_ead4e: ; ead4e
 	note A#, 2
 	note G#, 2
 	loopchannel 0, Music_ChampionBattle_branch_eacc6
-; ead61
 
-Music_ChampionBattle_branch_ead61: ; ead61
+Music_ChampionBattle_branch_ead61:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -737,9 +724,8 @@ Music_ChampionBattle_branch_ead61: ; ead61
 	note __, 1
 	note B_, 4
 	endchannel
-; ead6f
 
-Music_ChampionBattle_branch_ead6f: ; ead6f
+Music_ChampionBattle_branch_ead6f:
 	note D#, 1
 	note __, 1
 	note D#, 1
@@ -760,9 +746,8 @@ Music_ChampionBattle_branch_ead6f: ; ead6f
 	note D#, 1
 	note __, 1
 	endchannel
-; ead83
 
-Music_ChampionBattle_branch_ead83: ; ead83
+Music_ChampionBattle_branch_ead83:
 	octave 3
 	note D#, 2
 	note F#, 2
@@ -774,9 +759,8 @@ Music_ChampionBattle_branch_ead83: ; ead83
 	note C#, 2
 	note C_, 2
 	endchannel
-; ead8e
 
-Music_ChampionBattle_branch_ead8e: ; ead8e
+Music_ChampionBattle_branch_ead8e:
 	octave 3
 	note E_, 2
 	note B_, 2
@@ -788,4 +772,3 @@ Music_ChampionBattle_branch_ead8e: ; ead8e
 	note D#, 2
 	note E_, 2
 	endchannel
-; ead99

audio/music/cherrygrovecity.asm

@@ -1,11 +1,10 @@
-Music_CherrygroveCity: ; f5b03
+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
-; f5b0f
 
-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,4 +303,3 @@ Music_CherrygroveCity_branch_f5c4d: ; f5c4d
 	note C#, 2
 	note G_, 2
 	loopchannel 0, Music_CherrygroveCity_branch_f5c4d
-; f5c60

audio/music/clair.asm

@@ -1,11 +1,10 @@
-Music_Clair: ; 1fa8d
+Music_Clair:
 	musicheader 4, 1, Music_Clair_Ch1
 	musicheader 1, 2, Music_Clair_Ch2
 	musicheader 1, 3, Music_Clair_Ch3
 	musicheader 1, 4, Music_Clair_Ch4
-; 1fa99
 
-Music_Clair_Ch1: ; 1fa99
+Music_Clair_Ch1:
 	tempo 136
 	volume $77
 	tone $0001
@@ -13,7 +12,7 @@ Music_Clair_Ch1: ; 1fa99
 	stereopanning $f
 	notetype $c, $93
 	dutycycle $3
-Music_Clair_branch_1faab: ; 1faab
+Music_Clair_branch_1faab:
 	octave 4
 	note F_, 1
 	note F#, 1
@@ -37,7 +36,7 @@ Music_Clair_branch_1faab: ; 1faab
 	note D#, 4
 	note F_, 4
 	note G_, 4
-Music_Clair_branch_1fac9: ; 1fac9
+Music_Clair_branch_1fac9:
 	intensity $93
 	callchannel Music_Clair_branch_1fb12
 	octave 2
@@ -95,9 +94,8 @@ Music_Clair_branch_1fac9: ; 1fac9
 	octave 4
 	note D#, 1
 	loopchannel 0, Music_Clair_branch_1fac9
-; 1fb12
 
-Music_Clair_branch_1fb12: ; 1fb12
+Music_Clair_branch_1fb12:
 	dutycycle $3
 	stereopanning $ff
 	octave 3
@@ -122,9 +120,8 @@ Music_Clair_branch_1fb12: ; 1fb12
 	note C#, 1
 	note __, 1
 	endchannel
-; 1fb2e
 
-Music_Clair_branch_1fb2e: ; 1fb2e
+Music_Clair_branch_1fb2e:
 	octave 4
 	note F#, 1
 	note D#, 1
@@ -144,13 +141,12 @@ Music_Clair_branch_1fb2e: ; 1fb2e
 	note D#, 1
 	note F#, 1
 	endchannel
-; 1fb41
 
-Music_Clair_Ch2: ; 1fb41
+Music_Clair_Ch2:
 	dutycycle $3
 	vibrato $12, $34
 	notetype $6, $b7
-Music_Clair_branch_1fb49: ; 1fb49
+Music_Clair_branch_1fb49:
 	octave 3
 	note A#, 2
 	note B_, 2
@@ -189,7 +185,7 @@ Music_Clair_branch_1fb49: ; 1fb49
 	note G_, 2
 	note A#, 2
 	intensity $b7
-Music_Clair_branch_1fb77: ; 1fb77
+Music_Clair_branch_1fb77:
 	callchannel Music_Clair_branch_1fba6
 	note F#, 2
 	note __, 4
@@ -228,9 +224,8 @@ Music_Clair_branch_1fb77: ; 1fb77
 	note G#, 16
 	note __, 4
 	loopchannel 0, Music_Clair_branch_1fb77
-; 1fba6
 
-Music_Clair_branch_1fba6: ; 1fba6
+Music_Clair_branch_1fba6:
 	octave 4
 	note F#, 2
 	note __, 4
@@ -250,9 +245,8 @@ Music_Clair_branch_1fba6: ; 1fba6
 	note D#, 16
 	note __, 4
 	endchannel
-; 1fbb9
 
-Music_Clair_Ch3: ; 1fbb9
+Music_Clair_Ch3:
 	notetype $c, $14
 	pitchoffset 0, CC
 	octave 3
@@ -274,7 +268,7 @@ Music_Clair_Ch3: ; 1fbb9
 	note A#, 4
 	note G#, 4
 	note G_, 4
-Music_Clair_branch_1fbd1: ; 1fbd1
+Music_Clair_branch_1fbd1:
 	callchannel Music_Clair_branch_1fc3c
 	octave 2
 	note C#, 2
@@ -375,9 +369,8 @@ Music_Clair_branch_1fbd1: ; 1fbd1
 	octave 1
 	note G#, 1
 	loopchannel 0, Music_Clair_branch_1fbd1
-; 1fc3c
 
-Music_Clair_branch_1fc3c: ; 1fc3c
+Music_Clair_branch_1fc3c:
 	octave 1
 	note G#, 2
 	note __, 1
@@ -393,9 +386,8 @@ Music_Clair_branch_1fc3c: ; 1fc3c
 	octave 1
 	note G#, 2
 	endchannel
-; 1fc4b
 
-Music_Clair_Ch4: ; 1fc4b
+Music_Clair_Ch4:
 	togglenoise $3
 	notetype $c
 	stereopanning $f0
@@ -411,7 +403,7 @@ Music_Clair_Ch4: ; 1fc4b
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_Clair_branch_1fc5e: ; 1fc5e
+Music_Clair_branch_1fc5e:
 	stereopanning $ff
 	callchannel Music_Clair_branch_1fc6e
 	note G_, 1
@@ -419,9 +411,8 @@ Music_Clair_branch_1fc5e: ; 1fc5e
 	callchannel Music_Clair_branch_1fc6e
 	note F#, 1
 	loopchannel 0, Music_Clair_branch_1fc5e
-; 1fc6e
 
-Music_Clair_branch_1fc6e: ; 1fc6e
+Music_Clair_branch_1fc6e:
 	note D#, 2
 	stereopanning $f0
 	note G_, 2
@@ -440,4 +431,3 @@ Music_Clair_branch_1fc6e: ; 1fc6e
 	stereopanning $f0
 	note G_, 1
 	endchannel
-; 1fc87

audio/music/contestresults.asm

@@ -1,15 +1,14 @@
-Music_ContestResults: ; efb3e
+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
-; efb4a
 
-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,4 +171,3 @@ Music_ContestResults_branch_efbed: ; efbed
 	note G_, 1
 	note G_, 1
 	loopchannel 0, Music_ContestResults_branch_efbed
-; efc01

audio/music/credits.asm

@@ -1,11 +1,10 @@
-Music_Credits: ; 1f31c
+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
-; 1f328
 
-Music_Credits_Ch1: ; 1f328
+Music_Credits_Ch1:
 	tempo 139
 	volume $77
 	stereopanning $f
@@ -181,7 +180,7 @@ Music_Credits_Ch1: ; 1f328
 	octave 5
 	note C#, 6
 	notetype $c, $a7
-Music_Credits_branch_1f407: ; 1f407
+Music_Credits_branch_1f407:
 	octave 3
 	note A_, 1
 	octave 4
@@ -280,9 +279,8 @@ Music_Credits_branch_1f407: ; 1f407
 	note __, 16
 	note __, 16
 	endchannel
-; 1f483
 
-Music_Credits_branch_1f483: ; 1f483
+Music_Credits_branch_1f483:
 	note C_, 16
 	note F#, 1
 	note G_, 3
@@ -389,9 +387,8 @@ Music_Credits_branch_1f483: ; 1f483
 	note C_, 1
 	note __, 1
 	endchannel
-; 1f4ed
 
-Music_Credits_branch_1f4ed: ; 1f4ed
+Music_Credits_branch_1f4ed:
 	octave 4
 	note C_, 4
 	octave 3
@@ -403,9 +400,8 @@ Music_Credits_branch_1f4ed: ; 1f4ed
 	note C_, 4
 	note D#, 4
 	endchannel
-; 1f4f8
 
-Music_Credits_branch_1f4f8: ; 1f4f8
+Music_Credits_branch_1f4f8:
 	octave 3
 	note A_, 2
 	octave 4
@@ -503,9 +499,8 @@ Music_Credits_branch_1f4f8: ; 1f4f8
 	note C_, 2
 	note F_, 2
 	endchannel
-; 1f559
 
-Music_Credits_branch_1f559: ; 1f559
+Music_Credits_branch_1f559:
 	octave 3
 	note A_, 2
 	octave 4
@@ -547,9 +542,8 @@ Music_Credits_branch_1f559: ; 1f559
 	note A#, 2
 	note A_, 2
 	endchannel
-; 1f582
 
-Music_Credits_branch_1f582: ; 1f582
+Music_Credits_branch_1f582:
 	note __, 6
 	octave 3
 	note D_, 6
@@ -561,9 +555,8 @@ Music_Credits_branch_1f582: ; 1f582
 	note F#, 6
 	note C#, 6
 	endchannel
-; 1f58d
 
-Music_Credits_Ch2: ; 1f58d
+Music_Credits_Ch2:
 	dutycycle $1
 	vibrato $14, $23
 	notetype $c, $2f
@@ -723,7 +716,7 @@ Music_Credits_Ch2: ; 1f58d
 	octave 2
 	note F#, 1
 	note __, 1
-Music_Credits_branch_1f657: ; 1f657
+Music_Credits_branch_1f657:
 	octave 1
 	note G_, 2
 	octave 2
@@ -818,9 +811,8 @@ Music_Credits_branch_1f657: ; 1f657
 	note __, 16
 	note __, 16
 	endchannel
-; 1f6cb
 
-Music_Credits_branch_1f6cb: ; 1f6cb
+Music_Credits_branch_1f6cb:
 	octave 2
 	note C_, 4
 	intensity $b1
@@ -931,9 +923,8 @@ Music_Credits_branch_1f6cb: ; 1f6cb
 	octave 3
 	note C_, 2
 	endchannel
-; 1f73f
 
-Music_Credits_branch_1f73f: ; 1f73f
+Music_Credits_branch_1f73f:
 	octave 1
 	note G_, 4
 	note __, 4
@@ -943,9 +934,8 @@ Music_Credits_branch_1f73f: ; 1f73f
 	note G_, 12
 	note F#, 8
 	endchannel
-; 1f748
 
-Music_Credits_branch_1f748: ; 1f748
+Music_Credits_branch_1f748:
 	octave 4
 	note A_, 8
 	note B_, 8
@@ -980,9 +970,8 @@ Music_Credits_branch_1f748: ; 1f748
 	octave 5
 	note C_, 4
 	endchannel
-; 1f772
 
-Music_Credits_Ch3: ; 1f772
+Music_Credits_Ch3:
 	vibrato $16, $23
 	notetype $c, $34
 	stereopanning $ff
@@ -1238,9 +1227,8 @@ Music_Credits_Ch3: ; 1f772
 	note __, 16
 	note __, 16
 	endchannel
-; 1f8aa
 
-Music_Credits_branch_1f8aa: ; 1f8aa
+Music_Credits_branch_1f8aa:
 	note G_, 16
 	octave 6
 	note C#, 1
@@ -1280,9 +1268,8 @@ Music_Credits_branch_1f8aa: ; 1f8aa
 	notetype $c, $14
 	note D_, 16
 	endchannel
-; 1f8db
 
-Music_Credits_branch_1f8db: ; 1f8db
+Music_Credits_branch_1f8db:
 	notetype $6, $14
 	note F#, 1
 	note G_, 3
@@ -1293,9 +1280,8 @@ Music_Credits_branch_1f8db: ; 1f8db
 	note G_, 12
 	note G#, 8
 	endchannel
-; 1f8e7
 
-Music_Credits_branch_1f8e7: ; 1f8e7
+Music_Credits_branch_1f8e7:
 	octave 3
 	note F_, 4
 	note __, 2
@@ -1373,9 +1359,8 @@ Music_Credits_branch_1f8e7: ; 1f8e7
 	octave 3
 	note G#, 2
 	endchannel
-; 1f934
 
-Music_Credits_branch_1f934: ; 1f934
+Music_Credits_branch_1f934:
 	octave 2
 	note F_, 4
 	note __, 2
@@ -1399,9 +1384,8 @@ Music_Credits_branch_1f934: ; 1f934
 	note E_, 2
 	note F_, 2
 	endchannel
-; 1f94b
 
-Music_Credits_branch_1f94b: ; 1f94b
+Music_Credits_branch_1f94b:
 	octave 2
 	note F#, 4
 	note __, 2
@@ -1442,9 +1426,8 @@ Music_Credits_branch_1f94b: ; 1f94b
 	note G_, 2
 	note D_, 2
 	endchannel
-; 1f973
 
-Music_Credits_Ch4: ; 1f973
+Music_Credits_Ch4:
 	togglenoise $3
 	notetype $c
 	note G#, 1
@@ -1480,7 +1463,7 @@ Music_Credits_Ch4: ; 1f973
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9a8: ; 1f9a8
+Music_Credits_branch_1f9a8:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1508,7 +1491,7 @@ Music_Credits_branch_1f9a8: ; 1f9a8
 	note C#, 1
 	note D_, 1
 	note D_, 1
-Music_Credits_branch_1f9c6: ; 1f9c6
+Music_Credits_branch_1f9c6:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1542,7 +1525,7 @@ Music_Credits_branch_1f9c6: ; 1f9c6
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa4d
 	callchannel Music_Credits_branch_1fa6d
-Music_Credits_branch_1f9f2: ; 1f9f2
+Music_Credits_branch_1f9f2:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1621,9 +1604,8 @@ Music_Credits_branch_1f9f2: ; 1f9f2
 	note __, 16
 	note __, 16
 	endchannel
-; 1fa4d
 
-Music_Credits_branch_1fa4d: ; 1fa4d
+Music_Credits_branch_1fa4d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1656,9 +1638,8 @@ Music_Credits_branch_1fa4d: ; 1fa4d
 	note G_, 1
 	note F#, 2
 	endchannel
-; 1fa6d
 
-Music_Credits_branch_1fa6d: ; 1fa6d
+Music_Credits_branch_1fa6d:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1691,4 +1672,3 @@ Music_Credits_branch_1fa6d: ; 1fa6d
 	note A#, 1
 	note D_, 1
 	endchannel
-; 1fa8d

audio/music/crystalopening.asm

@@ -1,11 +1,10 @@
-Music_CrystalOpening: ; 1786e8
+Music_CrystalOpening:
 	musicheader 4, 1, Music_CrystalOpening_Ch1
 	musicheader 1, 2, Music_CrystalOpening_Ch2
 	musicheader 1, 3, Music_CrystalOpening_Ch3
 	musicheader 1, 4, Music_CrystalOpening_Ch4
-; 1786f4
 
-Music_CrystalOpening_Ch1: ; 1786f4
+Music_CrystalOpening_Ch1:
 	tempo 136
 	volume $77
 	tone $0002
@@ -121,9 +120,8 @@ Music_CrystalOpening_Ch1: ; 1786f4
 	octave 2
 	note D_, 16
 	endchannel
-; 17877a
 
-Music_CrystalOpening_Ch2: ; 17877a
+Music_CrystalOpening_Ch2:
 	notetype $c, $a2
 	dutycycle $3
 	vibrato $8, $44
@@ -177,9 +175,8 @@ Music_CrystalOpening_Ch2: ; 17877a
 	octave 3
 	note D_, 16
 	endchannel
-; 1787c8
 
-Music_CrystalOpening_Ch3: ; 1787c8
+Music_CrystalOpening_Ch3:
 	notetype $c, $16
 	octave 1
 	note B_, 4
@@ -242,9 +239,8 @@ Music_CrystalOpening_Ch3: ; 1787c8
 	note D_, 1
 	note __, 15
 	endchannel
-; 178810
 
-Music_CrystalOpening_Ch4: ; 178810
+Music_CrystalOpening_Ch4:
 	stereopanning $f
 	togglenoise $3
 	notetype $c
@@ -361,4 +357,3 @@ Music_CrystalOpening_Ch4: ; 178810
 	note __, 16
 	note __, 16
 	endchannel
-; 178889

audio/music/dancinghall.asm

@@ -1,19 +1,18 @@
-Music_DancingHall: ; ef9bc
+Music_DancingHall:
 	musicheader 3, 1, Music_DancingHall_Ch1
 	musicheader 1, 2, Music_DancingHall_Ch2
 	musicheader 1, 3, Music_DancingHall_Ch3
-; ef9c5
 
 	db $3
 
-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
@@ -64,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
@@ -88,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
@@ -144,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
@@ -222,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
@@ -233,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
@@ -308,4 +303,3 @@ Music_DancingHall_branch_efae3: ; efae3
 	octave 6
 	note D_, 1
 	loopchannel 0, Music_DancingHall_branch_efae3
-; efb3e

audio/music/darkcave.asm

@@ -1,11 +1,10 @@
-Music_DarkCave: ; ea2be
+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
-; ea2ca
 
-Music_DarkCave_Ch1: ; ea2ca
+Music_DarkCave_Ch1:
 	tempo 128
 	volume $77
 	dutycycle $3
@@ -13,7 +12,7 @@ Music_DarkCave_Ch1: ; ea2ca
 	vibrato $11, $15
 	stereopanning $f0
 	notetype $c, $a7
-Music_DarkCave_branch_ea2dc: ; ea2dc
+Music_DarkCave_branch_ea2dc:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea2dc
 	octave 3
@@ -22,7 +21,7 @@ Music_DarkCave_branch_ea2dc: ; ea2dc
 	note C#, 16
 	note C_, 16
 	intensity $a3
-Music_DarkCave_branch_ea2e8: ; ea2e8
+Music_DarkCave_branch_ea2e8:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 3, Music_DarkCave_branch_ea2e8
 	intensity $b7
@@ -43,7 +42,7 @@ Music_DarkCave_branch_ea2e8: ; ea2e8
 	note D#, 8
 	note C_, 8
 	intensity $a3
-Music_DarkCave_branch_ea303: ; ea303
+Music_DarkCave_branch_ea303:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea303
 	note __, 16
@@ -74,13 +73,12 @@ Music_DarkCave_branch_ea303: ; ea303
 	note G_, 2
 	note G#, 4
 	intensity $a3
-Music_DarkCave_branch_ea328: ; ea328
+Music_DarkCave_branch_ea328:
 	callchannel Music_DarkCave_branch_ea333
 	loopchannel 2, Music_DarkCave_branch_ea328
 	loopchannel 0, Music_DarkCave_branch_ea2e8
-; ea333
 
-Music_DarkCave_branch_ea333: ; ea333
+Music_DarkCave_branch_ea333:
 	octave 4
 	note D#, 2
 	octave 3
@@ -136,14 +134,13 @@ Music_DarkCave_branch_ea333: ; ea333
 	octave 3
 	note A#, 2
 	endchannel
-; ea36a
 
-Music_DarkCave_Ch2: ; ea36a
+Music_DarkCave_Ch2:
 	dutycycle $1
 	vibrato $12, $36
 	stereopanning $f
 	notetype $c, $a7
-Music_DarkCave_branch_ea374: ; ea374
+Music_DarkCave_branch_ea374:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea374
 	octave 3
@@ -151,7 +148,7 @@ Music_DarkCave_branch_ea374: ; ea374
 	note A#, 16
 	note F_, 16
 	note G_, 16
-Music_DarkCave_branch_ea37e: ; ea37e
+Music_DarkCave_branch_ea37e:
 	note __, 16
 	loopchannel 4, Music_DarkCave_branch_ea37e
 	note __, 8
@@ -347,14 +344,13 @@ Music_DarkCave_branch_ea37e: ; ea37e
 	note F_, 16
 	note D#, 16
 	loopchannel 0, Music_DarkCave_branch_ea37e
-; ea46e
 
-Music_DarkCave_Ch3: ; ea46e
+Music_DarkCave_Ch3:
 	notetype $c, $27
-Music_DarkCave_branch_ea471: ; ea471
+Music_DarkCave_branch_ea471:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 2, Music_DarkCave_branch_ea471
-Music_DarkCave_branch_ea478: ; ea478
+Music_DarkCave_branch_ea478:
 	callchannel Music_DarkCave_branch_ea4ce
 	loopchannel 7, Music_DarkCave_branch_ea478
 	callchannel Music_DarkCave_branch_ea4c3
@@ -386,9 +382,8 @@ Music_DarkCave_branch_ea478: ; ea478
 	callchannel Music_DarkCave_branch_ea4a7
 	callchannel Music_DarkCave_branch_ea4a7
 	loopchannel 0, Music_DarkCave_branch_ea478
-; ea4a7
 
-Music_DarkCave_branch_ea4a7: ; ea4a7
+Music_DarkCave_branch_ea4a7:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -417,9 +412,8 @@ Music_DarkCave_branch_ea4a7: ; ea4a7
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4c3
 
-Music_DarkCave_branch_ea4c3: ; ea4c3
+Music_DarkCave_branch_ea4c3:
 	octave 3
 	note C_, 4
 	note G_, 2
@@ -431,9 +425,8 @@ Music_DarkCave_branch_ea4c3: ; ea4c3
 	octave 2
 	note A#, 12
 	endchannel
-; ea4ce
 
-Music_DarkCave_branch_ea4ce: ; ea4ce
+Music_DarkCave_branch_ea4ce:
 	octave 2
 	note C_, 4
 	note G_, 2
@@ -462,12 +455,11 @@ Music_DarkCave_branch_ea4ce: ; ea4ce
 	note C_, 2
 	note C#, 4
 	endchannel
-; ea4ea
 
-Music_DarkCave_Ch4: ; ea4ea
+Music_DarkCave_Ch4:
 	togglenoise $3
 	notetype $c
-Music_DarkCave_branch_ea4ee: ; ea4ee
+Music_DarkCave_branch_ea4ee:
 	stereopanning $ff
 	note D#, 8
 	note D#, 8
@@ -489,4 +481,3 @@ Music_DarkCave_branch_ea4ee: ; ea4ee
 	note C#, 2
 	note C#, 2
 	loopchannel 0, Music_DarkCave_branch_ea4ee
-; ea50d

audio/music/dragonsden.asm

@@ -1,18 +1,17 @@
-Music_DragonsDen: ; eece8
+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
-; eecf4
 
-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,4 +169,3 @@ Music_DragonsDen_branch_eedbd: ; eedbd
 	stereopanning $f0
 	note F#, 4
 	loopchannel 0, Music_DragonsDen_branch_eedbd
-; eedcb

audio/music/ecruteakcity.asm

@@ -1,16 +1,15 @@
-Music_EcruteakCity: ; ef2d0
+Music_EcruteakCity:
 	musicheader 3, 1, Music_EcruteakCity_Ch1
 	musicheader 1, 2, Music_EcruteakCity_Ch2
 	musicheader 1, 3, Music_EcruteakCity_Ch3
-; ef2d9
 
-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,4 +665,3 @@ Music_EcruteakCity_branch_ef569: ; ef569
 	note __, 1
 	note B_, 1
 	endchannel
-; ef5b1

audio/music/elmslab.asm

@@ -1,11 +1,10 @@
-Music_ElmsLab: ; ea040
+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
-; ea04c
 
-Music_ElmsLab_Ch1: ; ea04c
+Music_ElmsLab_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -34,7 +33,7 @@ Music_ElmsLab_Ch1: ; ea04c
 	note A_, 4
 	note A_, 4
 	note A_, 2
-Music_ElmsLab_branch_ea075: ; ea075
+Music_ElmsLab_branch_ea075:
 	note __, 2
 	note A_, 2
 	note G#, 2
@@ -182,9 +181,8 @@ Music_ElmsLab_branch_ea075: ; ea075
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea075
-; ea128
 
-Music_ElmsLab_Ch2: ; ea128
+Music_ElmsLab_Ch2:
 	dutycycle $3
 	vibrato $10, $26
 	stereopanning $f
@@ -214,7 +212,7 @@ Music_ElmsLab_Ch2: ; ea128
 	note C_, 4
 	note C_, 2
 	stereopanning $ff
-Music_ElmsLab_branch_ea14f: ; ea14f
+Music_ElmsLab_branch_ea14f:
 	intensity $c6
 	octave 4
 	note F_, 6
@@ -350,9 +348,8 @@ Music_ElmsLab_branch_ea14f: ; ea14f
 	octave 3
 	note E_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea14f
-; ea1fd
 
-Music_ElmsLab_Ch3: ; ea1fd
+Music_ElmsLab_Ch3:
 	stereopanning $f
 	notetype $c, $25
 	note __, 8
@@ -375,7 +372,7 @@ Music_ElmsLab_Ch3: ; ea1fd
 	note C_, 2
 	note D_, 2
 	note E_, 2
-Music_ElmsLab_branch_ea216: ; ea216
+Music_ElmsLab_branch_ea216:
 	note F_, 2
 	note A_, 2
 	note C_, 2
@@ -528,15 +525,13 @@ Music_ElmsLab_branch_ea216: ; ea216
 	note F_, 2
 	note A_, 2
 	loopchannel 0, Music_ElmsLab_branch_ea216
-; ea2b1
 
-Music_ElmsLab_Ch4: ; ea2b1
+Music_ElmsLab_Ch4:
 	stereopanning $f0
 	togglenoise $0
 	notetype $c
 	note __, 16
 	note __, 2
-Music_ElmsLab_branch_ea2b9: ; ea2b9
+Music_ElmsLab_branch_ea2b9:
 	note G_, 4
 	loopchannel 0, Music_ElmsLab_branch_ea2b9
-; ea2be

audio/music/evolution.asm

@@ -1,11 +1,10 @@
-Music_Evolution: ; f06e1
+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
-; f06ed
 
-Music_Evolution_Ch1: ; f06ed
+Music_Evolution_Ch1:
 	tempo 132
 	volume $77
 	vibrato $6, $34
@@ -24,7 +23,7 @@ Music_Evolution_Ch1: ; f06ed
 	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,4 +197,3 @@ Music_Evolution_branch_f07f0: ; f07f0
 	note E_, 2
 	note E_, 2
 	loopchannel 0, Music_Evolution_branch_f07f0
-; f07fd

audio/music/gamecorner.asm

@@ -1,17 +1,16 @@
-Music_GameCorner: ; edd6d
+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
-; edd79
 
-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,4 +804,3 @@ Music_GameCorner_branch_ee10f: ; ee10f
 	note D_, 1
 	note F#, 2
 	endchannel
-; ee119

audio/music/goldenrodcity.asm

@@ -1,11 +1,10 @@
-Music_GoldenrodCity: ; eb453
+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
-; eb45f
 
-Music_GoldenrodCity_Ch1: ; eb45f
+Music_GoldenrodCity_Ch1:
 	stereopanning $f
 	tempo 176
 	volume $77
@@ -14,7 +13,7 @@ Music_GoldenrodCity_Ch1: ; eb45f
 	note __, 16
 	note __, 16
 	note __, 16
-Music_GoldenrodCity_branch_eb46d: ; eb46d
+Music_GoldenrodCity_branch_eb46d:
 	dutycycle $0
 	callchannel Music_GoldenrodCity_branch_eb4a9
 	octave 3
@@ -56,9 +55,8 @@ Music_GoldenrodCity_branch_eb46d: ; eb46d
 	octave 4
 	note C_, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb46d
-; eb4a9
 
-Music_GoldenrodCity_branch_eb4a9: ; eb4a9
+Music_GoldenrodCity_branch_eb4a9:
 	octave 4
 	note C#, 2
 	octave 3
@@ -99,9 +97,8 @@ Music_GoldenrodCity_branch_eb4a9: ; eb4a9
 	octave 4
 	note C#, 2
 	endchannel
-; eb4d1
 
-Music_GoldenrodCity_branch_eb4d1: ; eb4d1
+Music_GoldenrodCity_branch_eb4d1:
 	octave 4
 	note F_, 1
 	note C#, 1
@@ -174,14 +171,13 @@ Music_GoldenrodCity_branch_eb4d1: ; eb4d1
 	note D#, 1
 	note F#, 1
 	endchannel
-; eb519
 
-Music_GoldenrodCity_Ch2: ; eb519
+Music_GoldenrodCity_Ch2:
 	stereopanning $f0
 	vibrato $12, $23
 	dutycycle $2
 	notetype $c, $97
-Music_GoldenrodCity_branch_eb523: ; eb523
+Music_GoldenrodCity_branch_eb523:
 	intensity $97
 	callchannel Music_GoldenrodCity_branch_eb555
 	octave 4
@@ -216,9 +212,8 @@ Music_GoldenrodCity_branch_eb523: ; eb523
 	octave 4
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb523
-; eb555
 
-Music_GoldenrodCity_branch_eb555: ; eb555
+Music_GoldenrodCity_branch_eb555:
 	octave 4
 	note F_, 4
 	note C#, 4
@@ -247,9 +242,8 @@ Music_GoldenrodCity_branch_eb555: ; eb555
 	note F#, 2
 	dutycycle $1
 	endchannel
-; eb572
 
-Music_GoldenrodCity_branch_eb572: ; eb572
+Music_GoldenrodCity_branch_eb572:
 	note C#, 6
 	note F_, 6
 	note C#, 4
@@ -268,13 +262,12 @@ Music_GoldenrodCity_branch_eb572: ; eb572
 	note C_, 4
 	note D#, 2
 	endchannel
-; eb584
 
-Music_GoldenrodCity_Ch3: ; eb584
+Music_GoldenrodCity_Ch3:
 	stereopanning $ff
 	vibrato $8, $23
 	notetype $c, $25
-Music_GoldenrodCity_branch_eb58c: ; eb58c
+Music_GoldenrodCity_branch_eb58c:
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5aa
 	callchannel Music_GoldenrodCity_branch_eb5d2
@@ -294,9 +287,8 @@ Music_GoldenrodCity_branch_eb58c: ; eb58c
 	octave 2
 	note G#, 2
 	loopchannel 0, Music_GoldenrodCity_branch_eb58c
-; eb5aa
 
-Music_GoldenrodCity_branch_eb5aa: ; eb5aa
+Music_GoldenrodCity_branch_eb5aa:
 	octave 3
 	note C#, 4
 	note __, 2
@@ -337,9 +329,8 @@ Music_GoldenrodCity_branch_eb5aa: ; eb5aa
 	note G#, 1
 	note __, 1
 	endchannel
-; eb5d2
 
-Music_GoldenrodCity_branch_eb5d2: ; eb5d2
+Music_GoldenrodCity_branch_eb5d2:
 	note C#, 1
 	note __, 1
 	octave 4
@@ -392,9 +383,8 @@ Music_GoldenrodCity_branch_eb5d2: ; eb5d2
 	note __, 2
 	note G#, 1
 	endchannel
-; eb606
 
-Music_GoldenrodCity_Ch4: ; eb606
+Music_GoldenrodCity_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 16
@@ -406,7 +396,7 @@ Music_GoldenrodCity_Ch4: ; eb606
 	note D_, 1
 	note D_, 1
 	note F#, 2
-Music_GoldenrodCity_branch_eb613: ; eb613
+Music_GoldenrodCity_branch_eb613:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -447,7 +437,7 @@ Music_GoldenrodCity_branch_eb613: ; eb613
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_GoldenrodCity_branch_eb650: ; eb650
+Music_GoldenrodCity_branch_eb650:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -459,9 +449,8 @@ Music_GoldenrodCity_branch_eb650: ; eb650
 	loopchannel 3, Music_GoldenrodCity_branch_eb650
 	callchannel Music_GoldenrodCity_branch_eb663
 	loopchannel 0, Music_GoldenrodCity_branch_eb613
-; eb663
 
-Music_GoldenrodCity_branch_eb663: ; eb663
+Music_GoldenrodCity_branch_eb663:
 	note D#, 2
 	note F#, 2
 	note D_, 2
@@ -472,9 +461,8 @@ Music_GoldenrodCity_branch_eb663: ; eb663
 	note D_, 1
 	note F#, 2
 	endchannel
-; eb66d
 
-Music_GoldenrodCity_branch_eb66d: ; eb66d
+Music_GoldenrodCity_branch_eb66d:
 	note D#, 2
 	note D_, 1
 	note D#, 3
@@ -484,4 +472,3 @@ Music_GoldenrodCity_branch_eb66d: ; eb66d
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb676

audio/music/goldsilveropening.asm

@@ -1,10 +1,9 @@
-Music_GoldSilverOpening: ; f7055
+Music_GoldSilverOpening:
 	musicheader 3, 1, Music_GoldSilverOpening_Ch1
 	musicheader 1, 2, Music_GoldSilverOpening_Ch2
 	musicheader 1, 3, Music_GoldSilverOpening_Ch3
-; f705e
 
-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,4 +613,3 @@ Music_GoldSilverOpening_Ch3: ; f71c8
 	note C_, 1
 	note __, 13
 	endchannel
-; f7308

audio/music/goldsilveropening2.asm

@@ -1,11 +1,10 @@
-Music_GoldSilverOpening2: ; f7308
+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
-; f7314
 
-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,4 +215,3 @@ Music_GoldSilverOpening2_branch_f73f8: ; f73f8
 	loopchannel 4, Music_GoldSilverOpening2_branch_f73f8
 	note C_, 16
 	endchannel
-; f7411

audio/music/gym.asm

@@ -1,18 +1,17 @@
-Music_Gym: ; f48ae
+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
-; f48ba
 
-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,4 +564,3 @@ Music_Gym_branch_f4afa: ; f4afa
 	note F#, 4
 	loopchannel 8, Music_Gym_branch_f4afa
 	loopchannel 0, Music_Gym_branch_f4ac7
-; f4b0c

audio/music/gymleadervictory.asm

@@ -1,11 +1,10 @@
-Music_GymLeaderVictory: ; f462c
+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
-; f4638
 
-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,4 +417,3 @@ Music_GymLeaderVictory_branch_f480b: ; f480b
 	note D#, 2
 	loopchannel 3, Music_GymLeaderVictory_branch_f480b
 	endchannel
-; f4815

audio/music/halloffame.asm

@@ -1,11 +1,10 @@
-Music_HallOfFame: ; f05bf
+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
-; f05cb
 
-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,4 +170,3 @@ Music_HallOfFame_branch_f0677: ; f0677
 	note A#, 1
 	note A#, 1
 	loopchannel 0, Music_HallOfFame_branch_f0677
-; f0697

audio/music/healpokemon.asm

@@ -1,10 +1,9 @@
-Music_HealPokemon: ; f0697
+Music_HealPokemon:
 	musicheader 3, 1, Music_HealPokemon_Ch1
 	musicheader 1, 2, Music_HealPokemon_Ch2
 	musicheader 1, 3, Music_HealPokemon_Ch3
-; f06a0
 
-Music_HealPokemon_Ch1: ; f06a0
+Music_HealPokemon_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $2
@@ -23,9 +22,8 @@ Music_HealPokemon_Ch1: ; f06a0
 	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,4 +48,3 @@ Music_HealPokemon_Ch3: ; f06d4
 	note E_, 6
 	note __, 2
 	endchannel
-; f06e1

audio/music/indigoplateau.asm

@@ -1,17 +1,16 @@
-Music_IndigoPlateau: ; ee852
+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
-; ee85e
 
-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,4 +180,3 @@ Music_IndigoPlateau_branch_ee92a: ; ee92a
 	note D_, 2
 	note C#, 4
 	loopchannel 0, Music_IndigoPlateau_branch_ee92a
-; ee94b

audio/music/johtogymbattle.asm

@@ -1,24 +1,23 @@
-Music_JohtoGymBattle: ; ea50d
+Music_JohtoGymBattle:
 	musicheader 3, 1, Music_JohtoGymBattle_Ch1
 	musicheader 1, 2, Music_JohtoGymBattle_Ch2
 	musicheader 1, 3, Music_JohtoGymBattle_Ch3
-; ea516
 
-Music_JohtoGymBattle_Ch1: ; ea516
+Music_JohtoGymBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
 	tone $0002
 	vibrato $12, $15
 	notetype $c, $b2
-Music_JohtoGymBattle_branch_ea526: ; ea526
+Music_JohtoGymBattle_branch_ea526:
 	octave 3
 	note A#, 1
 	note A_, 1
 	note G#, 1
 	note A_, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea526
-Music_JohtoGymBattle_branch_ea52f: ; ea52f
+Music_JohtoGymBattle_branch_ea52f:
 	note C#, 1
 	note C_, 1
 	octave 2
@@ -58,7 +57,7 @@ Music_JohtoGymBattle_branch_ea52f: ; ea52f
 	octave 3
 	note G#, 2
 	note F_, 2
-Music_JohtoGymBattle_branch_ea55d: ; ea55d
+Music_JohtoGymBattle_branch_ea55d:
 	intensity $b5
 	note D_, 6
 	note G_, 6
@@ -286,21 +285,20 @@ Music_JohtoGymBattle_branch_ea55d: ; ea55d
 	note D#, 2
 	note F#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea55d
-; ea65f
 
-Music_JohtoGymBattle_Ch2: ; ea65f
+Music_JohtoGymBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
 	notetype $c, $c2
-Music_JohtoGymBattle_branch_ea66a: ; ea66a
+Music_JohtoGymBattle_branch_ea66a:
 	octave 4
 	note F#, 1
 	note F_, 1
 	note E_, 1
 	note A#, 1
 	loopchannel 4, Music_JohtoGymBattle_branch_ea66a
-Music_JohtoGymBattle_branch_ea673: ; ea673
+Music_JohtoGymBattle_branch_ea673:
 	note F#, 1
 	note F_, 1
 	note F#, 1
@@ -397,7 +395,7 @@ Music_JohtoGymBattle_branch_ea673: ; ea673
 	octave 3
 	note G#, 1
 	note A_, 1
-Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
+Music_JohtoGymBattle_branch_ea6ee:
 	intensity $c7
 	note A#, 8
 	intensity $c4
@@ -613,9 +611,8 @@ Music_JohtoGymBattle_branch_ea6ee: ; ea6ee
 	note B_, 16
 	note G_, 16
 	loopchannel 0, Music_JohtoGymBattle_branch_ea6ee
-; ea7f4
 
-Music_JohtoGymBattle_Ch3: ; ea7f4
+Music_JohtoGymBattle_Ch3:
 	notetype $c, $19
 	octave 4
 	note F_, 1
@@ -685,7 +682,7 @@ Music_JohtoGymBattle_Ch3: ; ea7f4
 	octave 3
 	note A#, 2
 	note G#, 2
-Music_JohtoGymBattle_branch_ea83f: ; ea83f
+Music_JohtoGymBattle_branch_ea83f:
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea963
 	callchannel Music_JohtoGymBattle_branch_ea96a
@@ -900,9 +897,8 @@ Music_JohtoGymBattle_branch_ea83f: ; ea83f
 	note F_, 2
 	note D#, 2
 	loopchannel 0, Music_JohtoGymBattle_branch_ea83f
-; ea952
 
-Music_JohtoGymBattle_branch_ea952: ; ea952
+Music_JohtoGymBattle_branch_ea952:
 	note G_, 2
 	note D_, 2
 	note F_, 2
@@ -920,30 +916,26 @@ Music_JohtoGymBattle_branch_ea952: ; ea952
 	note D#, 2
 	note F_, 2
 	endchannel
-; ea963
 
-Music_JohtoGymBattle_branch_ea963: ; ea963
+Music_JohtoGymBattle_branch_ea963:
 	note D_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea963
 	endchannel
-; ea96a
 
-Music_JohtoGymBattle_branch_ea96a: ; ea96a
+Music_JohtoGymBattle_branch_ea96a:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea96a
 	endchannel
-; ea971
 
-Music_JohtoGymBattle_branch_ea971: ; ea971
+Music_JohtoGymBattle_branch_ea971:
 	note C_, 2
 	note G_, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea971
 	endchannel
-; ea978
 
-Music_JohtoGymBattle_branch_ea978: ; ea978
+Music_JohtoGymBattle_branch_ea978:
 	octave 2
 	note A#, 2
 	octave 3
@@ -955,9 +947,8 @@ Music_JohtoGymBattle_branch_ea978: ; ea978
 	octave 2
 	note A#, 2
 	endchannel
-; ea983
 
-Music_JohtoGymBattle_branch_ea983: ; ea983
+Music_JohtoGymBattle_branch_ea983:
 	octave 3
 	note C_, 2
 	note G_, 2
@@ -971,9 +962,8 @@ Music_JohtoGymBattle_branch_ea983: ; ea983
 	octave 3
 	note C_, 2
 	endchannel
-; ea990
 
-Music_JohtoGymBattle_branch_ea990: ; ea990
+Music_JohtoGymBattle_branch_ea990:
 	note C#, 2
 	note G#, 2
 	octave 4
@@ -986,9 +976,8 @@ Music_JohtoGymBattle_branch_ea990: ; ea990
 	octave 3
 	note C#, 2
 	endchannel
-; ea99c
 
-Music_JohtoGymBattle_branch_ea99c: ; ea99c
+Music_JohtoGymBattle_branch_ea99c:
 	octave 3
 	note D_, 2
 	note A_, 2
@@ -1002,24 +991,21 @@ Music_JohtoGymBattle_branch_ea99c: ; ea99c
 	octave 3
 	note D_, 2
 	endchannel
-; ea9a9
 
-Music_JohtoGymBattle_branch_ea9a9: ; ea9a9
+Music_JohtoGymBattle_branch_ea9a9:
 	octave 3
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9a9
 	endchannel
-; ea9b1
 
-Music_JohtoGymBattle_branch_ea9b1: ; ea9b1
+Music_JohtoGymBattle_branch_ea9b1:
 	note C#, 2
 	note F#, 2
 	loopchannel 4, Music_JohtoGymBattle_branch_ea9b1
 	endchannel
-; ea9b8
 
-Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
+Music_JohtoGymBattle_branch_ea9b8:
 	note F_, 2
 	note C_, 2
 	note D#, 2
@@ -1029,4 +1015,3 @@ Music_JohtoGymBattle_branch_ea9b8: ; ea9b8
 	note F_, 2
 	note D#, 2
 	endchannel
-; ea9c1

audio/music/johtotrainerbattle.asm

@@ -1,10 +1,9 @@
-Music_JohtoTrainerBattle: ; f6096
+Music_JohtoTrainerBattle:
 	musicheader 3, 1, Music_JohtoTrainerBattle_Ch1
 	musicheader 1, 2, Music_JohtoTrainerBattle_Ch2
 	musicheader 1, 3, Music_JohtoTrainerBattle_Ch3
-; f609f
 
-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,4 +1329,3 @@ Music_JohtoTrainerBattle_branch_f66b4: ; f66b4
 	note G#, 1
 	note A#, 2
 	endchannel
-; f66c3

audio/music/johtowildbattle.asm

@@ -1,16 +1,15 @@
-Music_JohtoWildBattle: ; f5dc5
+Music_JohtoWildBattle:
 	musicheader 3, 1, Music_JohtoWildBattle_Ch1
 	musicheader 1, 2, Music_JohtoWildBattle_Ch2
 	musicheader 1, 3, Music_JohtoWildBattle_Ch3
-; f5dce
 
-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,11 +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

audio/music/johtowildbattlenight.asm

@@ -1,19 +1,17 @@
-Music_JohtoWildBattleNight: ; f605c
+Music_JohtoWildBattleNight:
 	musicheader 3, 1, Music_JohtoWildBattleNight_Ch1
 	musicheader 1, 2, Music_JohtoWildBattleNight_Ch2
 	musicheader 1, 3, Music_JohtoWildBattleNight_Ch3
-; f6065
 
-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,9 +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

audio/music/kantogymbattle.asm

@@ -1,10 +1,9 @@
-Music_KantoGymBattle: ; ec720
+Music_KantoGymBattle:
 	musicheader 3, 1, Music_KantoGymBattle_Ch1
 	musicheader 1, 2, Music_KantoGymBattle_Ch2
 	musicheader 1, 3, Music_KantoGymBattle_Ch3
-; ec729
 
-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,4 +608,3 @@ Music_KantoGymBattle_branch_ec9e5: ; ec9e5
 	note D#, 2
 	note F_, 2
 	loopchannel 0, Music_KantoGymBattle_branch_ec965
-; ec9fa

audio/music/kantotrainerbattle.asm

@@ -1,12 +1,11 @@
-Music_KantoTrainerBattle: ; ec9fa
+Music_KantoTrainerBattle:
 	musicheader 3, 1, Music_KantoTrainerBattle_Ch1
 	musicheader 1, 2, Music_KantoTrainerBattle_Ch2
 	musicheader 1, 3, Music_KantoTrainerBattle_Ch3
-; eca03
 
 	db $3
 
-Music_KantoTrainerBattle_Ch1: ; eca04
+Music_KantoTrainerBattle_Ch1:
 	tempo 114
 	volume $77
 	pitchoffset 1, B_
@@ -127,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
@@ -464,9 +463,8 @@ Music_KantoTrainerBattle_branch_eca88: ; eca88
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_eca88
-; ecbea
 
-Music_KantoTrainerBattle_Ch2: ; ecbea
+Music_KantoTrainerBattle_Ch2:
 	pitchoffset 1, B_
 	vibrato $6, $36
 	dutycycle $1
@@ -485,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
@@ -542,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
@@ -917,9 +915,8 @@ Music_KantoTrainerBattle_branch_ecc41: ; ecc41
 	octave 3
 	note B_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ecc41
-; ecdd2
 
-Music_KantoTrainerBattle_Ch3: ; ecdd2
+Music_KantoTrainerBattle_Ch3:
 	pitchoffset 1, B_
 	vibrato $12, $23
 	notetype $c, $15
@@ -1050,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
@@ -1537,4 +1534,3 @@ Music_KantoTrainerBattle_branch_ece5a: ; ece5a
 	octave 5
 	note G_, 4
 	loopchannel 0, Music_KantoTrainerBattle_branch_ece5a
-; ed06d

audio/music/kantowildbattle.asm

@@ -1,12 +1,11 @@
-Music_KantoWildBattle: ; ed06d
+Music_KantoWildBattle:
 	musicheader 3, 1, Music_KantoWildBattle_Ch1
 	musicheader 1, 2, Music_KantoWildBattle_Ch2
 	musicheader 1, 3, Music_KantoWildBattle_Ch3
-; ed076
 
 	db $3
 
-Music_KantoWildBattle_Ch1: ; ed077
+Music_KantoWildBattle_Ch1:
 	tempo 112
 	volume $77
 	vibrato $12, $23
@@ -25,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
@@ -208,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
@@ -216,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
@@ -265,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
@@ -304,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
@@ -493,9 +490,8 @@ endr
 	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
@@ -561,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
@@ -584,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
@@ -624,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
@@ -647,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
@@ -670,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
@@ -723,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
@@ -1222,4 +1213,3 @@ Music_KantoWildBattle_branch_ed39e: ; ed39e
 	note G_, 16
 	note G_, 16
 	loopchannel 0, Music_KantoWildBattle_branch_ed39e
-; ed5c6

audio/music/lakeofrage.asm

@@ -1,11 +1,10 @@
-Music_LakeOfRage: ; ee6c5
+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
-; ee6d1
 
-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,4 +320,3 @@ Music_LakeOfRage_branch_ee83b: ; ee83b
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_LakeOfRage_branch_ee83b
-; ee852

audio/music/lakeofragerocketradio.asm

@@ -1,17 +1,16 @@
-Music_LakeOfRageRocketRadio: ; ef5b1
+Music_LakeOfRageRocketRadio:
 	musicheader 3, 1, Music_LakeOfRageRocketRadio_Ch1
 	musicheader 1, 2, Music_LakeOfRageRocketRadio_Ch2
 	musicheader 1, 3, Music_LakeOfRageRocketRadio_Ch3
-; ef5ba
 
-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,20 +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

audio/music/lavendertown.asm

@@ -1,12 +1,11 @@
-Music_LavenderTown: ; ef72f
+Music_LavenderTown:
 	musicheader 3, 1, Music_LavenderTown_Ch1
 	musicheader 1, 2, Music_LavenderTown_Ch2
 	musicheader 1, 3, Music_LavenderTown_Ch3
-; ef738
 
 	db $3
 
-Music_LavenderTown_Ch1: ; ef739
+Music_LavenderTown_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -17,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
@@ -103,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
@@ -149,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
@@ -242,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
@@ -263,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
@@ -305,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
@@ -358,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
@@ -390,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
@@ -403,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
@@ -518,4 +512,3 @@ Music_LavenderTown_branch_ef941: ; ef941
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_LavenderTown_branch_ef941
-; ef9bc

audio/music/lighthouse.asm

@@ -1,18 +1,17 @@
-Music_Lighthouse: ; ee569
+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
-; ee575
 
-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,4 +307,3 @@ Music_Lighthouse_branch_ee6b1: ; ee6b1
 	note G#, 2
 	note A_, 2
 	loopchannel 0, Music_Lighthouse_branch_ee6b1
-; ee6c5

audio/music/lookbeauty.asm

@@ -1,11 +1,10 @@
-Music_LookBeauty: ; eee3e
+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
-; eee4a
 
-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,4 +323,3 @@ Music_LookBeauty_branch_eefa1: ; eefa1
 	note D_, 2
 	note G_, 2
 	endchannel
-; eefb2

audio/music/lookhiker.asm

@@ -1,11 +1,10 @@
-Music_LookHiker: ; f7411
+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
-; f741d
 
-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,17 +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

audio/music/lookkimonogirl.asm

@@ -1,12 +1,11 @@
-Music_LookKimonoGirl: ; f79b8
+Music_LookKimonoGirl:
 	musicheader 3, 1, Music_LookKimonoGirl_Ch1
 	musicheader 1, 2, Music_LookKimonoGirl_Ch2
 	musicheader 1, 3, Music_LookKimonoGirl_Ch3
-; f79c1
 
 	db $3
 
-Music_LookKimonoGirl_Ch1: ; f79c2
+Music_LookKimonoGirl_Ch1:
 	tempo 160
 	volume $77
 	stereopanning $f
@@ -15,7 +14,7 @@ Music_LookKimonoGirl_Ch1: ; f79c2
 	tone $0001
 	callchannel Music_LookKimonoGirl_branch_f7aa8
 	tone 0
-Music_LookKimonoGirl_branch_f79d7: ; f79d7
+Music_LookKimonoGirl_branch_f79d7:
 	notetype $c, $b2
 	callchannel Music_LookKimonoGirl_branch_f7a13
 	callchannel Music_LookKimonoGirl_branch_f7a13
@@ -49,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
@@ -77,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
@@ -105,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
@@ -156,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
@@ -179,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
@@ -215,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
@@ -233,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
@@ -270,4 +263,3 @@ Music_LookKimonoGirl_branch_f7aec: ; f7aec
 	note D_, 8
 	note E_, 8
 	loopchannel 0, Music_LookKimonoGirl_branch_f7aec
-; f7b13

audio/music/looklass.asm

@@ -1,11 +1,10 @@
-Music_LookLass: ; ed79b
+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
-; ed7a7
 
-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,4 +112,3 @@ Music_LookLass_branch_ed81f: ; ed81f
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_LookLass_branch_ed81f
-; ed82d

audio/music/lookmysticalman.asm

@@ -1,11 +1,10 @@
-Music_LookMysticalMan: ; 17843b
+Music_LookMysticalMan:
 	musicheader 4, 1, Music_LookMysticalMan_Ch1
 	musicheader 1, 2, Music_LookMysticalMan_Ch2
 	musicheader 1, 3, Music_LookMysticalMan_Ch3
 	musicheader 1, 4, Music_LookMysticalMan_Ch4
-; 178447
 
-Music_LookMysticalMan_Ch1: ; 178447
+Music_LookMysticalMan_Ch1:
 	tempo 136
 	volume $77
 	vibrato $a, $34
@@ -13,7 +12,7 @@ Music_LookMysticalMan_Ch1: ; 178447
 	stereopanning $f
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178458: ; 178458
+Music_LookMysticalMan_branch_178458:
 	dutycycle $3
 	notetype $6, $96
 	octave 3
@@ -94,7 +93,7 @@ Music_LookMysticalMan_branch_178458: ; 178458
 	note A#, 6
 	dutycycle $2
 	intensity $72
-Music_LookMysticalMan_branch_1784b4: ; 1784b4
+Music_LookMysticalMan_branch_1784b4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -124,7 +123,7 @@ Music_LookMysticalMan_branch_1784b4: ; 1784b4
 	note D_, 2
 	note F#, 2
 	note B_, 2
-Music_LookMysticalMan_branch_1784d4: ; 1784d4
+Music_LookMysticalMan_branch_1784d4:
 	octave 5
 	note D_, 2
 	octave 4
@@ -156,9 +155,8 @@ Music_LookMysticalMan_branch_1784d4: ; 1784d4
 	note F#, 2
 	note A#, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178458
-; 1784f9
 
-Music_LookMysticalMan_branch_1784f9: ; 1784f9
+Music_LookMysticalMan_branch_1784f9:
 	note D_, 16
 	octave 4
 	note D_, 2
@@ -192,14 +190,13 @@ Music_LookMysticalMan_branch_1784f9: ; 1784f9
 	note B_, 2
 	note A_, 6
 	endchannel
-; 17851a
 
-Music_LookMysticalMan_Ch2: ; 17851a
+Music_LookMysticalMan_Ch2:
 	dutycycle $3
 	vibrato $a, $34
 	notetype $c, $b3
 	note __, 8
-Music_LookMysticalMan_branch_178523: ; 178523
+Music_LookMysticalMan_branch_178523:
 	stereopanning $f0
 	notetype $6, $b8
 	octave 3
@@ -297,9 +294,8 @@ Music_LookMysticalMan_branch_178523: ; 178523
 	note A#, 16
 	note __, 2
 	loopchannel 0, Music_LookMysticalMan_branch_178523
-; 17859a
 
-Music_LookMysticalMan_branch_17859a: ; 17859a
+Music_LookMysticalMan_branch_17859a:
 	note B_, 2
 	note __, 2
 	octave 4
@@ -343,9 +339,8 @@ Music_LookMysticalMan_branch_17859a: ; 17859a
 	note F#, 2
 	note E_, 6
 	endchannel
-; 1785c8
 
-Music_LookMysticalMan_branch_1785c8: ; 1785c8
+Music_LookMysticalMan_branch_1785c8:
 	note C#, 8
 	intensity $88
 	note C_, 1
@@ -361,12 +356,11 @@ Music_LookMysticalMan_branch_1785c8: ; 1785c8
 	note __, 1
 	intensity $b8
 	endchannel
-; 1785db
 
-Music_LookMysticalMan_Ch3: ; 1785db
+Music_LookMysticalMan_Ch3:
 	notetype $6, $16
 	note __, 16
-Music_LookMysticalMan_branch_1785df: ; 1785df
+Music_LookMysticalMan_branch_1785df:
 	octave 2
 	note B_, 4
 	octave 3
@@ -421,7 +415,7 @@ Music_LookMysticalMan_branch_1785df: ; 1785df
 	note A_, 2
 	octave 3
 	note E_, 2
-Music_LookMysticalMan_branch_178615: ; 178615
+Music_LookMysticalMan_branch_178615:
 	octave 2
 	note F#, 4
 	note A#, 2
@@ -537,9 +531,8 @@ Music_LookMysticalMan_branch_178615: ; 178615
 	note B_, 8
 	note A#, 4
 	loopchannel 0, Music_LookMysticalMan_branch_1785df
-; 17868e
 
-Music_LookMysticalMan_Ch4: ; 17868e
+Music_LookMysticalMan_Ch4:
 	togglenoise $3
 	notetype $c
 	note D#, 2
@@ -547,7 +540,7 @@ Music_LookMysticalMan_Ch4: ; 17868e
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_178697: ; 178697
+Music_LookMysticalMan_branch_178697:
 	callchannel Music_LookMysticalMan_branch_1786d3
 	callchannel Music_LookMysticalMan_branch_1786d9
 	callchannel Music_LookMysticalMan_branch_1786d3
@@ -566,7 +559,7 @@ Music_LookMysticalMan_branch_178697: ; 178697
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_LookMysticalMan_branch_1786ba: ; 1786ba
+Music_LookMysticalMan_branch_1786ba:
 	note D_, 2
 	note D#, 2
 	note D_, 3
@@ -586,27 +579,24 @@ Music_LookMysticalMan_branch_1786ba: ; 1786ba
 	note D_, 1
 	loopchannel 2, Music_LookMysticalMan_branch_1786ba
 	loopchannel 0, Music_LookMysticalMan_branch_178697
-; 1786d3
 
-Music_LookMysticalMan_branch_1786d3: ; 1786d3
+Music_LookMysticalMan_branch_1786d3:
 	note D#, 4
 	note D_, 3
 	note D#, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786d9
 
-Music_LookMysticalMan_branch_1786d9: ; 1786d9
+Music_LookMysticalMan_branch_1786d9:
 	note D#, 4
 	note D_, 3
 	note D_, 3
 	note D#, 2
 	note D_, 4
 	endchannel
-; 1786df
 
-Music_LookMysticalMan_branch_1786df: ; 1786df
+Music_LookMysticalMan_branch_1786df:
 	note D#, 4
 	note D_, 2
 	note D#, 1
@@ -616,4 +606,3 @@ Music_LookMysticalMan_branch_1786df: ; 1786df
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1786e8

audio/music/lookofficer.asm

@@ -1,10 +1,9 @@
-Music_LookOfficer: ; ed82d
+Music_LookOfficer:
 	musicheader 3, 1, Music_LookOfficer_Ch1
 	musicheader 1, 2, Music_LookOfficer_Ch2
 	musicheader 1, 3, Music_LookOfficer_Ch3
-; ed836
 
-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
@@ -78,9 +76,8 @@ Music_LookOfficer_branch_ed882: ; ed882
 	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,4 +135,3 @@ Music_LookOfficer_branch_ed8c8: ; ed8c8
 	note E_, 8
 	note C#, 8
 	loopchannel 0, Music_LookOfficer_branch_ed8c8
-; ed8dd

audio/music/lookpokemaniac.asm

@@ -1,10 +1,9 @@
-Music_LookPokemaniac: ; ebde1
+Music_LookPokemaniac:
 	musicheader 3, 1, Music_LookPokemaniac_Ch1
 	musicheader 1, 2, Music_LookPokemaniac_Ch2
 	musicheader 1, 3, Music_LookPokemaniac_Ch3
-; ebdea
 
-Music_LookPokemaniac_Ch1: ; ebdea
+Music_LookPokemaniac_Ch1:
 	stereopanning $f
 	tempo 144
 	volume $77
@@ -12,7 +11,7 @@ Music_LookPokemaniac_Ch1: ; ebdea
 	tone $0002
 	notetype $c, $b3
 	note __, 8
-Music_LookPokemaniac_branch_ebdfb: ; ebdfb
+Music_LookPokemaniac_branch_ebdfb:
 	note __, 4
 	octave 3
 	note A#, 1
@@ -27,9 +26,8 @@ Music_LookPokemaniac_branch_ebdfb: ; ebdfb
 	note __, 3
 	loopchannel 4, Music_LookPokemaniac_branch_ebdfb
 	loopchannel 0, Music_LookPokemaniac_branch_ebdfb
-; ebe12
 
-Music_LookPokemaniac_Ch2: ; ebe12
+Music_LookPokemaniac_Ch2:
 	stereopanning $ff
 	vibrato $2, $33
 	tone $0001
@@ -41,7 +39,7 @@ Music_LookPokemaniac_Ch2: ; ebe12
 	note C_, 1
 	octave 1
 	note A_, 4
-Music_LookPokemaniac_branch_ebe24: ; ebe24
+Music_LookPokemaniac_branch_ebe24:
 	octave 2
 	note C_, 2
 	note __, 2
@@ -59,7 +57,7 @@ Music_LookPokemaniac_branch_ebe24: ; ebe24
 	note D#, 1
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe24
-Music_LookPokemaniac_branch_ebe38: ; ebe38
+Music_LookPokemaniac_branch_ebe38:
 	octave 1
 	note A_, 2
 	note __, 2
@@ -79,9 +77,8 @@ Music_LookPokemaniac_branch_ebe38: ; ebe38
 	note __, 3
 	loopchannel 2, Music_LookPokemaniac_branch_ebe38
 	loopchannel 0, Music_LookPokemaniac_branch_ebe24
-; ebe51
 
-Music_LookPokemaniac_Ch3: ; ebe51
+Music_LookPokemaniac_Ch3:
 	stereopanning $f0
 	vibrato $6, $33
 	notetype $c, $15
@@ -93,15 +90,14 @@ Music_LookPokemaniac_Ch3: ; ebe51
 	octave 5
 	note C_, 4
 	intensity $10
-Music_LookPokemaniac_branch_ebe62: ; ebe62
+Music_LookPokemaniac_branch_ebe62:
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $14
 	callchannel Music_LookPokemaniac_branch_ebe70
 	intensity $10
 	loopchannel 0, Music_LookPokemaniac_branch_ebe62
-; ebe70
 
-Music_LookPokemaniac_branch_ebe70: ; ebe70
+Music_LookPokemaniac_branch_ebe70:
 	note A#, 6
 	note A_, 2
 	note G#, 2
@@ -161,4 +157,3 @@ Music_LookPokemaniac_branch_ebe70: ; ebe70
 	note C_, 1
 	note __, 1
 	endchannel
-; ebeab

audio/music/lookrival.asm

@@ -1,11 +1,10 @@
-Music_LookRival: ; f4f79
+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
-; f4f85
 
-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,4 +350,3 @@ Music_LookRival_branch_f5118: ; f5118
 	note D_, 2
 	note D_, 2
 	loopchannel 0, Music_LookRival_branch_f5118
-; f5127

audio/music/lookrocket.asm

@@ -1,11 +1,10 @@
-Music_LookRocket: ; f74a2
+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
-; f74ae
 
-Music_LookRocket_Ch1: ; f74ae
+Music_LookRocket_Ch1:
 	tempo 123
 	volume $77
 	pitchoffset 0, D_
@@ -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,9 +87,8 @@ Music_RocketTheme_branch_f750c: ; f750c
 	note C_, 1
 	note __, 5
 	endchannel
-; f7514
 
-Music_LookRocket_Ch2: ; f7514
+Music_LookRocket_Ch2:
 	pitchoffset 0, D_
 	vibrato $4, $64
 	dutycycle $3
@@ -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
+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,4 +394,3 @@ Music_RocketTheme_branch_f7664: ; f7664
 	note D_, 2
 	note F#, 2
 	endchannel
-; f766d

audio/music/looksage.asm

@@ -1,9 +1,8 @@
-Music_LookSage: ; ee35e
+Music_LookSage:
 	musicheader 2, 1, Music_LookSage_Ch1
 	musicheader 1, 3, Music_LookSage_Ch3
-; ee364
 
-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,4 +176,3 @@ Music_LookSage_branch_ee430: ; ee430
 	note G_, 1
 	note G#, 1
 	loopchannel 0, Music_LookSage_branch_ee430
-; ee45f

audio/music/lookyoungster.asm

@@ -1,10 +1,9 @@
-Music_LookYoungster: ; f66c3
+Music_LookYoungster:
 	musicheader 3, 1, Music_LookYoungster_Ch1
 	musicheader 1, 2, Music_LookYoungster_Ch2
 	musicheader 1, 3, Music_LookYoungster_Ch3
-; f66cc
 
-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,11 +58,10 @@ Music_LookYoungster_branch_f66ea: ; f66ea
 	note __, 1
 	note __, 16
 	loopchannel 0, Music_LookYoungster_branch_f66ea
-; f670e
 
 	db $ff
 
-Music_LookYoungster_Ch2: ; f670f
+Music_LookYoungster_Ch2:
 	stereopanning $f0
 	vibrato $12, $26
 	dutycycle $1
@@ -84,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
@@ -158,11 +156,10 @@ Music_LookYoungster_branch_f672f: ; f672f
 	note C_, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f672f
-; f6783
 
 	db $ff
 
-Music_LookYoungster_Ch3: ; f6784
+Music_LookYoungster_Ch3:
 	stereopanning $ff
 	vibrato $2, $24
 	notetype $c, $25
@@ -198,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
@@ -294,6 +291,5 @@ Music_LookYoungster_branch_f67ae: ; f67ae
 	note G#, 1
 	note __, 1
 	loopchannel 0, Music_LookYoungster_branch_f67ae
-; f6810
 
 	db $ff

audio/music/magnettrain.asm

@@ -1,11 +1,10 @@
-Music_MagnetTrain: ; ef5f0
+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
-; ef5fc
 
-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,11 +244,9 @@ Music_MagnetTrain_Ch4: ; ef6f4
 	notetype $c
 	note B_, 16
 	endchannel
-; ef711
-
 
 ; unused
-Music_MagnetTrain_branch_ef711: ; ef711
+Music_MagnetTrain_branch_ef711:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -266,10 +260,8 @@ Music_MagnetTrain_branch_ef711: ; ef711
 	note G_, 1
 	note G_, 1
 	endchannel
-; ef71e
 
-
-Music_MagnetTrain_branch_ef71e: ; ef71e
+Music_MagnetTrain_branch_ef71e:
 	note G#, 2
 	note G_, 2
 	note G_, 2
@@ -287,4 +279,3 @@ Music_MagnetTrain_branch_ef71e: ; ef71e
 	note G_, 2
 	note G_, 2
 	endchannel
-; ef72f

audio/music/mainmenu.asm

@@ -1,11 +1,10 @@
-Music_MainMenu: ; f78fd
+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
-; f7909
 
-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,4 +140,3 @@ Music_MainMenu_branch_f79a5: ; f79a5
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_MainMenu_branch_f79a5
-; f79b8

audio/music/mobileadapter.asm

@@ -1,11 +1,10 @@
-Music_MobileAdapter: ; 1fc87
+Music_MobileAdapter:
 	musicheader 4, 1, Music_MobileAdapter_Ch1
 	musicheader 1, 2, Music_MobileAdapter_Ch2
 	musicheader 1, 3, Music_MobileAdapter_Ch3
 	musicheader 1, 4, Music_MobileAdapter_Ch4
-; 1fc93
 
-Music_MobileAdapter_Ch1: ; 1fc93
+Music_MobileAdapter_Ch1:
 	tempo 132
 	volume $77
 	tone $0001
@@ -23,7 +22,7 @@ Music_MobileAdapter_Ch1: ; 1fc93
 	note D_, 1
 	note __, 1
 	note C#, 4
-Music_MobileAdapter_branch_1fcad: ; 1fcad
+Music_MobileAdapter_branch_1fcad:
 	callchannel Music_MobileAdapter_branch_1fd39
 	note D_, 1
 	note C#, 1
@@ -147,9 +146,8 @@ Music_MobileAdapter_branch_1fcad: ; 1fcad
 	intensity $77
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fcad
-; 1fd39
 
-Music_MobileAdapter_branch_1fd39: ; 1fd39
+Music_MobileAdapter_branch_1fd39:
 	intensity $94
 	octave 4
 	note F#, 1
@@ -190,9 +188,8 @@ Music_MobileAdapter_branch_1fd39: ; 1fd39
 	octave 4
 	note C#, 1
 	endchannel
-; 1fd63
 
-Music_MobileAdapter_Ch2: ; 1fd63
+Music_MobileAdapter_Ch2:
 	notetype $c, $c1
 	vibrato $10, $23
 	dutycycle $2
@@ -216,7 +213,7 @@ Music_MobileAdapter_Ch2: ; 1fd63
 	octave 4
 	note D_, 1
 	note F#, 1
-Music_MobileAdapter_branch_1fd80: ; 1fd80
+Music_MobileAdapter_branch_1fd80:
 	callchannel Music_MobileAdapter_branch_1fdfe
 	note A_, 4
 	note G_, 4
@@ -324,9 +321,8 @@ Music_MobileAdapter_branch_1fd80: ; 1fd80
 	note D_, 1
 	note F#, 1
 	loopchannel 0, Music_MobileAdapter_branch_1fd80
-; 1fdfe
 
-Music_MobileAdapter_branch_1fdfe: ; 1fdfe
+Music_MobileAdapter_branch_1fdfe:
 	note A_, 1
 	note __, 1
 	note A_, 1
@@ -351,9 +347,8 @@ Music_MobileAdapter_branch_1fdfe: ; 1fdfe
 	octave 4
 	note B_, 2
 	endchannel
-; 1fe16
 
-Music_MobileAdapter_branch_1fe16: ; 1fe16
+Music_MobileAdapter_branch_1fe16:
 	octave 5
 	note F#, 1
 	note D_, 1
@@ -393,9 +388,8 @@ Music_MobileAdapter_branch_1fe16: ; 1fe16
 	octave 5
 	note C#, 4
 	endchannel
-; 1fe3d
 
-Music_MobileAdapter_Ch3: ; 1fe3d
+Music_MobileAdapter_Ch3:
 	notetype $c, $14
 	note __, 2
 	octave 3
@@ -412,7 +406,7 @@ Music_MobileAdapter_Ch3: ; 1fe3d
 	note E_, 1
 	note __, 1
 	note A_, 4
-Music_MobileAdapter_branch_1fe4f: ; 1fe4f
+Music_MobileAdapter_branch_1fe4f:
 	callchannel Music_MobileAdapter_branch_1fecf
 	callchannel Music_MobileAdapter_branch_1fee3
 	callchannel Music_MobileAdapter_branch_1feee
@@ -516,16 +510,15 @@ Music_MobileAdapter_branch_1fe4f: ; 1fe4f
 	note D_, 4
 	callchannel Music_MobileAdapter_branch_1ff09
 	loopchannel 0, Music_MobileAdapter_branch_1fe4f
-; 1fecf
 
-Music_MobileAdapter_branch_1fecf: ; 1fecf
+Music_MobileAdapter_branch_1fecf:
 	octave 3
 	note D_, 1
 	note __, 1
 	note A_, 1
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fecf
-Music_MobileAdapter_branch_1fed8: ; 1fed8
+Music_MobileAdapter_branch_1fed8:
 	octave 2
 	note G_, 1
 	note __, 1
@@ -534,9 +527,8 @@ Music_MobileAdapter_branch_1fed8: ; 1fed8
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fed8
 	endchannel
-; 1fee3
 
-Music_MobileAdapter_branch_1fee3: ; 1fee3
+Music_MobileAdapter_branch_1fee3:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -545,9 +537,8 @@ Music_MobileAdapter_branch_1fee3: ; 1fee3
 	note __, 1
 	loopchannel 4, Music_MobileAdapter_branch_1fee3
 	endchannel
-; 1feee
 
-Music_MobileAdapter_branch_1feee: ; 1feee
+Music_MobileAdapter_branch_1feee:
 	note D_, 1
 	note __, 1
 	note A_, 1
@@ -557,9 +548,8 @@ Music_MobileAdapter_branch_1feee: ; 1feee
 	note A_, 1
 	note __, 1
 	endchannel
-; 1fef7
 
-Music_MobileAdapter_branch_1fef7: ; 1fef7
+Music_MobileAdapter_branch_1fef7:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -578,9 +568,8 @@ Music_MobileAdapter_branch_1fef7: ; 1fef7
 	octave 2
 	note A_, 4
 	endchannel
-; 1ff09
 
-Music_MobileAdapter_branch_1ff09: ; 1ff09
+Music_MobileAdapter_branch_1ff09:
 	octave 2
 	note A_, 1
 	note __, 1
@@ -613,9 +602,8 @@ Music_MobileAdapter_branch_1ff09: ; 1ff09
 	note __, 6
 	loopchannel 2, Music_MobileAdapter_branch_1ff09
 	endchannel
-; 1ff2c
 
-Music_MobileAdapter_Ch4: ; 1ff2c
+Music_MobileAdapter_Ch4:
 	togglenoise $3
 	stereopanning $f0
 	notetype $c
@@ -625,10 +613,10 @@ Music_MobileAdapter_Ch4: ; 1ff2c
 	note D_, 2
 	note D_, 1
 	note D_, 1
-Music_MobileAdapter_branch_1ff38: ; 1ff38
+Music_MobileAdapter_branch_1ff38:
 	callchannel Music_MobileAdapter_branch_1ff60
 	callchannel Music_MobileAdapter_branch_1ff60
-Music_MobileAdapter_branch_1ff3e: ; 1ff3e
+Music_MobileAdapter_branch_1ff3e:
 	note __, 4
 	note D_, 8
 	note D_, 8
@@ -637,7 +625,7 @@ Music_MobileAdapter_branch_1ff3e: ; 1ff3e
 	note D_, 3
 	note D_, 4
 	loopchannel 2, Music_MobileAdapter_branch_1ff3e
-Music_MobileAdapter_branch_1ff49: ; 1ff49
+Music_MobileAdapter_branch_1ff49:
 	note __, 4
 	note D_, 4
 	loopchannel 11, Music_MobileAdapter_branch_1ff49
@@ -655,9 +643,8 @@ Music_MobileAdapter_branch_1ff49: ; 1ff49
 	note D_, 1
 	note D_, 1
 	loopchannel 0, Music_MobileAdapter_branch_1ff38
-; 1ff60
 
-Music_MobileAdapter_branch_1ff60: ; 1ff60
+Music_MobileAdapter_branch_1ff60:
 	note __, 4
 	note D_, 4
 	loopchannel 7, Music_MobileAdapter_branch_1ff60
@@ -667,4 +654,3 @@ Music_MobileAdapter_branch_1ff60: ; 1ff60
 	note D_, 1
 	note D_, 1
 	endchannel
-; 1ff6c

audio/music/mobileadaptermenu.asm

@@ -1,10 +1,9 @@
-Music_MobileAdapterMenu: ; 17801f
+Music_MobileAdapterMenu:
 	musicheader 3, 1, Music_MobileAdapterMenu_Ch1
 	musicheader 1, 2, Music_MobileAdapterMenu_Ch2
 	musicheader 1, 3, Music_MobileAdapterMenu_Ch3
-; 178028
 
-Music_MobileAdapterMenu_Ch1: ; 178028
+Music_MobileAdapterMenu_Ch1:
 	tempo 168
 	volume $77
 	tone $0001
@@ -12,7 +11,7 @@ Music_MobileAdapterMenu_Ch1: ; 178028
 	dutycycle $2
 	notetype $c, $66
 	note __, 2
-Music_MobileAdapterMenu_branch_178038: ; 178038
+Music_MobileAdapterMenu_branch_178038:
 	callchannel Music_MobileAdapterMenu_branch_178057
 	callchannel Music_MobileAdapterMenu_branch_178076
 	octave 3
@@ -33,9 +32,8 @@ Music_MobileAdapterMenu_branch_178038: ; 178038
 	note D#, 8
 	callchannel Music_MobileAdapterMenu_branch_178057
 	loopchannel 0, Music_MobileAdapterMenu_branch_178038
-; 178057
 
-Music_MobileAdapterMenu_branch_178057: ; 178057
+Music_MobileAdapterMenu_branch_178057:
 	octave 3
 	note G#, 7
 	octave 4
@@ -67,9 +65,8 @@ Music_MobileAdapterMenu_branch_178057: ; 178057
 	note A_, 1
 	note G#, 8
 	endchannel
-; 178076
 
-Music_MobileAdapterMenu_branch_178076: ; 178076
+Music_MobileAdapterMenu_branch_178076:
 	note E_, 1
 	note __, 1
 	note A_, 1
@@ -84,16 +81,15 @@ Music_MobileAdapterMenu_branch_178076: ; 178076
 	note __, 1
 	note C#, 4
 	endchannel
-; 178084
 
-Music_MobileAdapterMenu_Ch2: ; 178084
+Music_MobileAdapterMenu_Ch2:
 	stereopanning $f0
 	notetype $c, $84
 	dutycycle $2
 	octave 4
 	note E_, 1
 	note G#, 1
-Music_MobileAdapterMenu_branch_17808e: ; 17808e
+Music_MobileAdapterMenu_branch_17808e:
 	callchannel Music_MobileAdapterMenu_branch_1780ae
 	note E_, 8
 	callchannel Music_MobileAdapterMenu_branch_1780d7
@@ -115,9 +111,8 @@ Music_MobileAdapterMenu_branch_17808e: ; 17808e
 	note E_, 1
 	note G#, 1
 	loopchannel 0, Music_MobileAdapterMenu_branch_17808e
-; 1780ae
 
-Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
+Music_MobileAdapterMenu_branch_1780ae:
 	octave 4
 	note B_, 1
 	note __, 1
@@ -159,9 +154,8 @@ Music_MobileAdapterMenu_branch_1780ae: ; 1780ae
 	note C#, 3
 	note D#, 1
 	endchannel
-; 1780d7
 
-Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
+Music_MobileAdapterMenu_branch_1780d7:
 	note A_, 1
 	note __, 1
 	note A_, 1
@@ -173,13 +167,12 @@ Music_MobileAdapterMenu_branch_1780d7: ; 1780d7
 	note __, 1
 	note E_, 4
 	endchannel
-; 1780e2
 
-Music_MobileAdapterMenu_Ch3: ; 1780e2
+Music_MobileAdapterMenu_Ch3:
 	vibrato $8, $34
 	notetype $c, $25
 	note __, 2
-Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
+Music_MobileAdapterMenu_branch_1780e9:
 	callchannel Music_MobileAdapterMenu_branch_178119
 	octave 2
 	note B_, 1
@@ -217,9 +210,8 @@ Music_MobileAdapterMenu_branch_1780e9: ; 1780e9
 	callchannel Music_MobileAdapterMenu_branch_178119
 	note __, 2
 	loopchannel 0, Music_MobileAdapterMenu_branch_1780e9
-; 178119
 
-Music_MobileAdapterMenu_branch_178119: ; 178119
+Music_MobileAdapterMenu_branch_178119:
 	octave 3
 	note E_, 2
 	note __, 2
@@ -263,9 +255,8 @@ Music_MobileAdapterMenu_branch_178119: ; 178119
 	note E_, 3
 	intensity $25
 	endchannel
-; 178146
 
-Music_MobileAdapterMenu_branch_178146: ; 178146
+Music_MobileAdapterMenu_branch_178146:
 	note A_, 2
 	note __, 2
 	octave 3
@@ -279,4 +270,3 @@ Music_MobileAdapterMenu_branch_178146: ; 178146
 	octave 3
 	note A_, 4
 	endchannel
-; 178153

audio/music/mobilecenter.asm

@@ -1,11 +1,10 @@
-Music_MobileCenter: ; 17961d
+Music_MobileCenter:
 	musicheader 4, 1, Music_MobileCenter_Ch1
 	musicheader 1, 2, Music_MobileCenter_Ch2
 	musicheader 1, 3, Music_MobileCenter_Ch3
 	musicheader 1, 4, Music_MobileCenter_Ch4
-; 179629
 
-Music_MobileCenter_Ch1: ; 179629
+Music_MobileCenter_Ch1:
 	tempo 160
 	volume $77
 	dutycycle $1
@@ -20,7 +19,7 @@ Music_MobileCenter_Ch1: ; 179629
 	note G_, 2
 	note A_, 2
 	note B_, 4
-Music_MobileCenter_branch_179642: ; 179642
+Music_MobileCenter_branch_179642:
 	octave 3
 	note E_, 2
 	note C_, 2
@@ -156,9 +155,8 @@ Music_MobileCenter_branch_179642: ; 179642
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_MobileCenter_branch_179642
-; 1796cc
 
-Music_MobileCenter_Ch2: ; 1796cc
+Music_MobileCenter_Ch2:
 	notetype $c, $c2
 	dutycycle $3
 	note __, 10
@@ -166,7 +164,7 @@ Music_MobileCenter_Ch2: ; 1796cc
 	note G_, 2
 	note A_, 2
 	note B_, 2
-Music_MobileCenter_branch_1796d6: ; 1796d6
+Music_MobileCenter_branch_1796d6:
 	octave 2
 	note C_, 2
 	note E_, 2
@@ -325,9 +323,8 @@ Music_MobileCenter_branch_1796d6: ; 1796d6
 	note E_, 2
 	note D_, 2
 	loopchannel 0, Music_MobileCenter_branch_1796d6
-; 179777
 
-Music_MobileCenter_Ch3: ; 179777
+Music_MobileCenter_Ch3:
 	notetype $c, $24
 	vibrato $10, $34
 	octave 4
@@ -339,7 +336,7 @@ Music_MobileCenter_Ch3: ; 179777
 	note C_, 2
 	note D_, 4
 	notetype $c, $25
-Music_MobileCenter_branch_179788: ; 179788
+Music_MobileCenter_branch_179788:
 	note C_, 2
 	octave 4
 	note G_, 2
@@ -452,9 +449,8 @@ Music_MobileCenter_branch_179788: ; 179788
 	note C_, 8
 	vibrato $10, $34
 	loopchannel 0, Music_MobileCenter_branch_179788
-; 179807
 
-Music_MobileCenter_Ch4: ; 179807
+Music_MobileCenter_Ch4:
 	togglenoise $3
 	stereopanning $f
 	notetype $c
@@ -464,7 +460,7 @@ Music_MobileCenter_Ch4: ; 179807
 	note C#, 1
 	note C#, 1
 	note C#, 1
-Music_MobileCenter_branch_179813: ; 179813
+Music_MobileCenter_branch_179813:
 	note A_, 2
 	note C#, 2
 	note C#, 2
@@ -485,4 +481,3 @@ Music_MobileCenter_branch_179813: ; 179813
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_MobileCenter_branch_179813
-; 17982d

audio/music/mom.asm

@@ -1,10 +1,9 @@
-Music_Mom: ; f6bf2
+Music_Mom:
 	musicheader 3, 2, Music_Mom_Ch2
 	musicheader 1, 3, Music_Mom_Ch3
 	musicheader 1, 4, Music_Mom_Ch4
-; f6bfb
 
-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,4 +106,3 @@ Music_Mom_branch_f6c56: ; f6c56
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Mom_branch_f6c56
-; f6c72

audio/music/mtmoon.asm

@@ -1,11 +1,10 @@
-Music_MtMoon: ; edb29
+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
-; edb35
 
-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,4 +136,3 @@ Music_MtMoon_branch_edbc3: ; edbc3
 	stereopanning $f0
 	note A#, 8
 	loopchannel 0, Music_MtMoon_branch_edbc3
-; edbd8

audio/music/mtmoonsquare.asm

@@ -1,17 +1,16 @@
-Music_MtMoonSquare: ; f4815
+Music_MtMoonSquare:
 	musicheader 2, 1, Music_MtMoonSquare_Ch1
 	musicheader 1, 2, Music_MtMoonSquare_Ch2
-; f481b
 
-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,4 +105,3 @@ Music_MtMoonSquare_branch_f489b: ; f489b
 	notetype $c, $62
 	loopchannel 2, Music_MtMoonSquare_branch_f489b
 	loopchannel 0, Music_MtMoonSquare_branch_f4862
-; f48ae

audio/music/nationalpark.asm

@@ -1,11 +1,10 @@
-Music_NationalPark: ; f54e8
+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
-; f54f4
 
-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,4 +655,3 @@ Music_NationalPark_branch_f57c8: ; f57c8
 	note A#, 1
 	note D#, 1
 	loopchannel 0, Music_NationalPark_branch_f57bd
-; f57e8

audio/music/newbarktown.asm

@@ -1,19 +1,18 @@
-Music_NewBarkTown: ; eb2d3
+Music_NewBarkTown:
 	musicheader 3, 1, Music_NewBarkTown_Ch1
 	musicheader 1, 2, Music_NewBarkTown_Ch2
 	musicheader 1, 3, Music_NewBarkTown_Ch3
-; eb2dc
 
 	db $3
 
-Music_NewBarkTown_Ch1: ; eb2dd
+Music_NewBarkTown_Ch1:
 	tempo 187
 	volume $77
 	stereopanning $f
 	vibrato $12, $23
 	notetype $c, $87
 	note __, 4
-Music_NewBarkTown_branch_eb2eb: ; eb2eb
+Music_NewBarkTown_branch_eb2eb:
 	dutycycle $0
 	callchannel Music_NewBarkTown_branch_eb349
 	octave 3
@@ -85,9 +84,8 @@ Music_NewBarkTown_branch_eb2eb: ; eb2eb
 	note B_, 2
 	intensity $87
 	loopchannel 0, Music_NewBarkTown_branch_eb2eb
-; eb349
 
-Music_NewBarkTown_branch_eb349: ; eb349
+Music_NewBarkTown_branch_eb349:
 	octave 3
 	note F#, 1
 	note __, 1
@@ -139,9 +137,8 @@ Music_NewBarkTown_branch_eb349: ; eb349
 	note B_, 1
 	note __, 1
 	endchannel
-; eb37c
 
-Music_NewBarkTown_branch_eb37c: ; eb37c
+Music_NewBarkTown_branch_eb37c:
 	octave 2
 	note G_, 2
 	note B_, 2
@@ -159,14 +156,13 @@ Music_NewBarkTown_branch_eb37c: ; eb37c
 	note A_, 4
 	note E_, 2
 	endchannel
-; eb38d
 
-Music_NewBarkTown_Ch2: ; eb38d
+Music_NewBarkTown_Ch2:
 	stereopanning $ff
 	vibrato $12, $23
 	notetype $6, $a7
 	note __, 8
-Music_NewBarkTown_branch_eb396: ; eb396
+Music_NewBarkTown_branch_eb396:
 	dutycycle $2
 	notetype $6, $a7
 	callchannel Music_NewBarkTown_branch_eb3bf
@@ -190,9 +186,8 @@ Music_NewBarkTown_branch_eb396: ; eb396
 	note D_, 4
 	note E_, 16
 	loopchannel 0, Music_NewBarkTown_branch_eb396
-; eb3bf
 
-Music_NewBarkTown_branch_eb3bf: ; eb3bf
+Music_NewBarkTown_branch_eb3bf:
 	octave 2
 	note D_, 4
 	note __, 8
@@ -244,9 +239,8 @@ Music_NewBarkTown_branch_eb3bf: ; eb3bf
 	octave 2
 	note C#, 4
 	endchannel
-; eb3f2
 
-Music_NewBarkTown_branch_eb3f2: ; eb3f2
+Music_NewBarkTown_branch_eb3f2:
 	notetype $6, $97
 	dutycycle $2
 	octave 4
@@ -256,15 +250,14 @@ Music_NewBarkTown_branch_eb3f2: ; eb3f2
 	notetype $c, $97
 	note E_, 16
 	endchannel
-; eb400
 
-Music_NewBarkTown_Ch3: ; eb400
+Music_NewBarkTown_Ch3:
 	stereopanning $f0
 	notetype $c, $10
 	octave 5
 	note D_, 2
 	note E_, 2
-Music_NewBarkTown_branch_eb408: ; eb408
+Music_NewBarkTown_branch_eb408:
 	vibrato $16, $23
 	note F#, 4
 	note A_, 4
@@ -329,4 +322,3 @@ Music_NewBarkTown_branch_eb408: ; eb408
 	note D_, 1
 	note E_, 1
 	loopchannel 0, Music_NewBarkTown_branch_eb408
-; eb453

audio/music/nothing.asm

@@ -1,13 +1,11 @@
-Music_Nothing: ; e91a3
+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
-; e91af
 
-Music_Nothing_Ch1: ; e91af
-Music_Nothing_Ch2: ; e91af
-Music_Nothing_Ch3: ; e91af
-Music_Nothing_Ch4: ; e91af
+Music_Nothing_Ch1:
+Music_Nothing_Ch2:
+Music_Nothing_Ch3:
+Music_Nothing_Ch4:
 	endchannel
-; e91b0

audio/music/pallettown.asm

@@ -1,16 +1,15 @@
-Music_PalletTown: ; f4b0c
+Music_PalletTown:
 	musicheader 3, 1, Music_PalletTown_Ch1
 	musicheader 1, 2, Music_PalletTown_Ch2
 	musicheader 1, 3, Music_PalletTown_Ch3
-; f4b15
 
-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,4 +355,3 @@ Music_PalletTown_branch_f4c2d: ; f4c2d
 	note B_, 8
 	note A_, 8
 	loopchannel 0, Music_PalletTown_branch_f4c2d
-; f4c9f

audio/music/pokeflutechannel.asm

@@ -1,10 +1,9 @@
-Music_PokeFluteChannel: ; f7b13
+Music_PokeFluteChannel:
 	musicheader 3, 1, Music_PokeFluteChannel_Ch1
 	musicheader 1, 2, Music_PokeFluteChannel_Ch2
 	musicheader 1, 3, Music_PokeFluteChannel_Ch3
-; f7b1c
 
-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,4 +225,3 @@ Music_PokeFluteChannel_branch_f7c05: ; f7c05
 	note F_, 2
 	note G_, 4
 	endchannel
-; f7c16

audio/music/pokemoncenter.asm

@@ -1,17 +1,16 @@
-Music_PokemonCenter: ; ed5c6
+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
-; ed5d2
 
-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,17 +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

audio/music/pokemonchannel.asm

@@ -1,11 +1,10 @@
-Music_PokemonChannel: ; ee45f
+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
-; ee46b
 
-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,4 +229,3 @@ Music_PokemonChannel_branch_ee54d: ; ee54d
 	note A#, 4
 	note A#, 4
 	endchannel
-; ee569

audio/music/pokemonlullaby.asm

@@ -1,15 +1,14 @@
-Music_PokemonLullaby: ; f6d79
+Music_PokemonLullaby:
 	musicheader 3, 1, Music_PokemonLullaby_Ch1
 	musicheader 1, 2, Music_PokemonLullaby_Ch2
 	musicheader 1, 3, Music_PokemonLullaby_Ch3
-; f6d82
 
-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,4 +130,3 @@ Music_PokemonLullaby_branch_f6e06: ; f6e06
 	note B_, 2
 	note A_, 2
 	loopchannel 0, Music_PokemonLullaby_branch_f6e06
-; f6e23

audio/music/pokemonmarch.asm

@@ -1,11 +1,10 @@
-Music_PokemonMarch: ; f6e23
+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
-; f6e2f
 
-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,4 +457,3 @@ Music_PokemonMarch_branch_f704c: ; f704c
 	note D_, 2
 	note C#, 2
 	endchannel
-; f7055

audio/music/postcredits.asm

@@ -1,18 +1,17 @@
-Music_PostCredits: ; cfd9e
+Music_PostCredits:
 	musicheader 2, 1, Music_PostCredits_Ch1
 	musicheader 1, 2, Music_PostCredits_Ch2
-; cfda4
 
 	db $2
 
-Music_PostCredits_Ch1: ; cfda5
+Music_PostCredits_Ch1:
 	tempo 271
 	volume $77
 	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $93
 	note __, 8
-Music_PostCredits_branch_cfdb2: ; cfdb2
+Music_PostCredits_branch_cfdb2:
 	octave 3
 	note C_, 2
 	note E_, 2
@@ -130,9 +129,8 @@ Music_PostCredits_branch_cfdb2: ; cfdb2
 	octave 2
 	note G_, 2
 	loopchannel 0, Music_PostCredits_branch_cfdb2
-; cfe48
 
-Music_PostCredits_Ch2: ; cfe48
+Music_PostCredits_Ch2:
 	pitchoffset 0, D#
 	dutycycle $2
 	notetype $c, $a3
@@ -144,7 +142,7 @@ Music_PostCredits_Ch2: ; cfe48
 	note F_, 2
 	intensity $73
 	note F_, 2
-Music_PostCredits_branch_cfe5a: ; cfe5a
+Music_PostCredits_branch_cfe5a:
 	intensity $a3
 	note G_, 2
 	intensity $73
@@ -264,4 +262,3 @@ Music_PostCredits_branch_cfe5a: ; cfe5a
 	note E_, 2
 	note F_, 2
 	loopchannel 0, Music_PostCredits_branch_cfe5a
-; cff04

audio/music/printer.asm

@@ -1,8 +1,7 @@
-Music_Printer: ; f07fd
+Music_Printer:
 	musicheader 1, 3, Music_Printer_Ch3
-; f0800
 
-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,4 +317,3 @@ Music_Printer_branch_f0823: ; f0823
 	note D#, 1
 	note __, 1
 	loopchannel 0, Music_Printer_branch_f0823
-; f0941

audio/music/profoak.asm

@@ -1,10 +1,9 @@
-Music_ProfOak: ; f4dea
+Music_ProfOak:
 	musicheader 3, 1, Music_ProfOak_Ch1
 	musicheader 1, 2, Music_ProfOak_Ch2
 	musicheader 1, 3, Music_ProfOak_Ch3
-; f4df3
 
-Music_ProfOak_Ch1: ; f4df3
+Music_ProfOak_Ch1:
 	tempo 118
 	volume $77
 	vibrato $12, $34
@@ -22,14 +21,14 @@ 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
@@ -41,9 +40,8 @@ Music_ProfOak_branch_f4e22: ; f4e22
 	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,13 +223,13 @@ 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
@@ -248,9 +241,8 @@ Music_ProfOak_branch_f4f1d: ; f4f1d
 	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,4 +309,3 @@ Music_ProfOak_branch_f4f69: ; f4f69
 	octave 2
 	note B_, 2
 	endchannel
-; f4f79

audio/music/profoakspokemontalk.asm

@@ -1,12 +1,11 @@
-Music_ProfOaksPokemonTalk: ; f4c9f
+Music_ProfOaksPokemonTalk:
 	musicheader 3, 1, Music_ProfOaksPokemonTalk_Ch1
 	musicheader 1, 2, Music_ProfOaksPokemonTalk_Ch2
 	musicheader 1, 3, Music_ProfOaksPokemonTalk_Ch3
-; f4ca8
 
 	db $3
 
-Music_ProfOaksPokemonTalk_Ch1: ; f4ca9
+Music_ProfOaksPokemonTalk_Ch1:
 	tempo 164
 	volume $77
 	stereopanning $f
@@ -24,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
@@ -132,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
@@ -157,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
@@ -208,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
@@ -225,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
@@ -308,4 +305,3 @@ Music_ProfOaksPokemonTalk_branch_f4d95: ; f4d95
 	note A#, 1
 	note __, 1
 	loopchannel 0, Music_ProfOaksPokemonTalk_branch_f4d95
-; f4dea

audio/music/rivalbattle.asm

@@ -1,10 +1,9 @@
-Music_RivalBattle: ; e974f
+Music_RivalBattle:
 	musicheader 3, 1, Music_RivalBattle_Ch1
 	musicheader 1, 2, Music_RivalBattle_Ch2
 	musicheader 1, 3, Music_RivalBattle_Ch3
-; e9758
 
-Music_RivalBattle_Ch1: ; e9758
+Music_RivalBattle_Ch1:
 	tempo 102
 	volume $77
 	dutycycle $3
@@ -23,7 +22,7 @@ Music_RivalBattle_Ch1: ; e9758
 	intensity $b7
 	note C#, 6
 	note E_, 4
-Music_RivalBattle_branch_e9777: ; e9777
+Music_RivalBattle_branch_e9777:
 	intensity $b2
 	octave 2
 	note A#, 6
@@ -40,7 +39,7 @@ Music_RivalBattle_branch_e9777: ; e9777
 	note C#, 4
 	intensity $b7
 	note C#, 10
-Music_RivalBattle_branch_e978f: ; e978f
+Music_RivalBattle_branch_e978f:
 	intensity $b2
 	octave 3
 	note G#, 6
@@ -56,7 +55,7 @@ Music_RivalBattle_branch_e978f: ; e978f
 	note B_, 4
 	intensity $4d
 	note B_, 10
-Music_RivalBattle_branch_e97a6: ; e97a6
+Music_RivalBattle_branch_e97a6:
 	intensity $b7
 	note A#, 6
 	note F#, 6
@@ -179,7 +178,7 @@ Music_RivalBattle_branch_e97a6: ; e97a6
 	note E_, 2
 	note D#, 2
 	note C#, 2
-Music_RivalBattle_branch_e9837: ; e9837
+Music_RivalBattle_branch_e9837:
 	octave 3
 	note A#, 2
 	note E_, 2
@@ -285,9 +284,8 @@ Music_RivalBattle_branch_e9837: ; e9837
 	octave 3
 	note C#, 10
 	loopchannel 0, Music_RivalBattle_branch_e97a6
-; e98af
 
-Music_RivalBattle_Ch2: ; e98af
+Music_RivalBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -337,7 +335,7 @@ Music_RivalBattle_Ch2: ; e98af
 	note F#, 6
 	intensity $c2
 	note G#, 4
-Music_RivalBattle_branch_e98ea: ; e98ea
+Music_RivalBattle_branch_e98ea:
 	intensity $c2
 	note D#, 6
 	intensity $c7
@@ -354,7 +352,7 @@ Music_RivalBattle_branch_e98ea: ; e98ea
 	note B_, 1
 	octave 4
 	note C_, 1
-Music_RivalBattle_branch_e9903: ; e9903
+Music_RivalBattle_branch_e9903:
 	intensity $c2
 	note C#, 6
 	intensity $c7
@@ -369,7 +367,7 @@ Music_RivalBattle_branch_e9903: ; e9903
 	note E_, 4
 	intensity $b7
 	note E_, 6
-Music_RivalBattle_branch_e991a: ; e991a
+Music_RivalBattle_branch_e991a:
 	callchannel Music_RivalBattle_branch_e99e0
 	intensity $b0
 	note G#, 8
@@ -474,7 +472,7 @@ Music_RivalBattle_branch_e991a: ; e991a
 	note G#, 8
 	intensity $c7
 	note F_, 8
-Music_RivalBattle_branch_e99a6: ; e99a6
+Music_RivalBattle_branch_e99a6:
 	intensity $c2
 	octave 3
 	note A#, 6
@@ -493,7 +491,7 @@ Music_RivalBattle_branch_e99a6: ; e99a6
 	note C#, 6
 	intensity $9a
 	note C#, 4
-Music_RivalBattle_branch_e99c1: ; e99c1
+Music_RivalBattle_branch_e99c1:
 	intensity $c2
 	octave 3
 	note G#, 6
@@ -513,9 +511,8 @@ Music_RivalBattle_branch_e99c1: ; e99c1
 	octave 4
 	note D_, 4
 	loopchannel 0, Music_RivalBattle_branch_e991a
-; e99e0
 
-Music_RivalBattle_branch_e99e0: ; e99e0
+Music_RivalBattle_branch_e99e0:
 	intensity $c7
 	note D#, 10
 	intensity $c4
@@ -536,9 +533,8 @@ Music_RivalBattle_branch_e99e0: ; e99e0
 	intensity $b7
 	note F_, 8
 	endchannel
-; e99fb
 
-Music_RivalBattle_Ch3: ; e99fb
+Music_RivalBattle_Ch3:
 	notetype $c, $19
 	octave 3
 	note F#, 2
@@ -554,7 +550,7 @@ Music_RivalBattle_Ch3: ; e99fb
 	octave 3
 	note C#, 2
 	note D_, 2
-Music_RivalBattle_branch_e9a0c: ; e9a0c
+Music_RivalBattle_branch_e9a0c:
 	note D#, 2
 	note C#, 2
 	note D#, 2
@@ -563,7 +559,7 @@ Music_RivalBattle_branch_e9a0c: ; e9a0c
 	note D#, 2
 	note C#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a0c
-Music_RivalBattle_branch_e9a17: ; e9a17
+Music_RivalBattle_branch_e9a17:
 	octave 3
 	note C#, 2
 	octave 2
@@ -586,7 +582,7 @@ Music_RivalBattle_branch_e9a17: ; e9a17
 	note C_, 2
 	note C#, 2
 	note D_, 2
-Music_RivalBattle_branch_e9a30: ; e9a30
+Music_RivalBattle_branch_e9a30:
 	callchannel Music_RivalBattle_branch_e9b47
 	octave 2
 	note A#, 2
@@ -633,14 +629,14 @@ Music_RivalBattle_branch_e9a30: ; e9a30
 	octave 3
 	note F_, 2
 	callchannel Music_RivalBattle_branch_e9b50
-Music_RivalBattle_branch_e9a66: ; e9a66
+Music_RivalBattle_branch_e9a66:
 	note C#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9a66
 	callchannel Music_RivalBattle_branch_e9b5c
 	note G#, 2
 	note F#, 2
-Music_RivalBattle_branch_e9a71: ; e9a71
+Music_RivalBattle_branch_e9a71:
 	octave 2
 	note A#, 2
 	octave 3
@@ -698,29 +694,29 @@ Music_RivalBattle_branch_e9a71: ; e9a71
 	note F#, 2
 	note G_, 2
 	note G#, 2
-Music_RivalBattle_branch_e9ab3: ; e9ab3
+Music_RivalBattle_branch_e9ab3:
 	note D#, 2
 	note A#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab3
-Music_RivalBattle_branch_e9ab9: ; e9ab9
+Music_RivalBattle_branch_e9ab9:
 	note D#, 2
 	note A_, 2
 	loopchannel 4, Music_RivalBattle_branch_e9ab9
-Music_RivalBattle_branch_e9abf: ; e9abf
+Music_RivalBattle_branch_e9abf:
 	note D#, 2
 	note G#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9abf
-Music_RivalBattle_branch_e9ac5: ; e9ac5
+Music_RivalBattle_branch_e9ac5:
 	note D#, 2
 	note G_, 2
 	loopchannel 12, Music_RivalBattle_branch_e9ac5
-Music_RivalBattle_branch_e9acb: ; e9acb
+Music_RivalBattle_branch_e9acb:
 	octave 2
 	note B_, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9acb
-Music_RivalBattle_branch_e9ad3: ; e9ad3
+Music_RivalBattle_branch_e9ad3:
 	octave 2
 	note B_, 2
 	octave 3
@@ -779,7 +775,7 @@ Music_RivalBattle_branch_e9ad3: ; e9ad3
 	note C#, 8
 	note D#, 8
 	note F_, 8
-Music_RivalBattle_branch_e9b10: ; e9b10
+Music_RivalBattle_branch_e9b10:
 	octave 2
 	note A#, 2
 	octave 3
@@ -787,7 +783,7 @@ Music_RivalBattle_branch_e9b10: ; e9b10
 	loopchannel 7, Music_RivalBattle_branch_e9b10
 	note E_, 2
 	note D#, 2
-Music_RivalBattle_branch_e9b1a: ; e9b1a
+Music_RivalBattle_branch_e9b1a:
 	octave 2
 	note A#, 2
 	octave 3
@@ -799,7 +795,7 @@ Music_RivalBattle_branch_e9b1a: ; e9b1a
 	note F#, 2
 	note F_, 2
 	note E_, 2
-Music_RivalBattle_branch_e9b28: ; e9b28
+Music_RivalBattle_branch_e9b28:
 	octave 2
 	note G#, 2
 	octave 3
@@ -807,7 +803,7 @@ Music_RivalBattle_branch_e9b28: ; e9b28
 	loopchannel 7, Music_RivalBattle_branch_e9b28
 	note D_, 2
 	note C#, 2
-Music_RivalBattle_branch_e9b32: ; e9b32
+Music_RivalBattle_branch_e9b32:
 	octave 2
 	note G#, 2
 	octave 3
@@ -823,18 +819,16 @@ Music_RivalBattle_branch_e9b32: ; e9b32
 	note D#, 2
 	note D_, 2
 	loopchannel 0, Music_RivalBattle_branch_e9a30
-; e9b47
 
-Music_RivalBattle_branch_e9b47: ; e9b47
+Music_RivalBattle_branch_e9b47:
 	octave 2
 	note A#, 2
 	octave 3
 	note D#, 2
 	loopchannel 4, Music_RivalBattle_branch_e9b47
 	endchannel
-; e9b50
 
-Music_RivalBattle_branch_e9b50: ; e9b50
+Music_RivalBattle_branch_e9b50:
 	note C#, 2
 	note G#, 2
 	octave 4
@@ -847,18 +841,16 @@ Music_RivalBattle_branch_e9b50: ; e9b50
 	note C#, 2
 	note G#, 2
 	endchannel
-; e9b5c
 
-Music_RivalBattle_branch_e9b5c: ; e9b5c
+Music_RivalBattle_branch_e9b5c:
 	octave 2
 	note B_, 2
 	octave 3
 	note F#, 2
 	loopchannel 7, Music_RivalBattle_branch_e9b5c
 	endchannel
-; e9b65
 
-Music_RivalBattle_branch_e9b65: ; e9b65
+Music_RivalBattle_branch_e9b65:
 	octave 3
 	note D#, 2
 	note A#, 2
@@ -866,4 +858,3 @@ Music_RivalBattle_branch_e9b65: ; e9b65
 	note D#, 2
 	loopchannel 2, Music_RivalBattle_branch_e9b65
 	endchannel
-; e9b6f

audio/music/rocketbattle.asm

@@ -1,10 +1,9 @@
-Music_RocketBattle: ; e9b6f
+Music_RocketBattle:
 	musicheader 3, 1, Music_RocketBattle_Ch1
 	musicheader 1, 2, Music_RocketBattle_Ch2
 	musicheader 1, 3, Music_RocketBattle_Ch3
-; e9b78
 
-Music_RocketBattle_Ch1: ; e9b78
+Music_RocketBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
@@ -48,7 +47,7 @@ Music_RocketBattle_Ch1: ; e9b78
 	note C_, 1
 	octave 2
 	note B_, 1
-Music_RocketBattle_branch_e9bad: ; e9bad
+Music_RocketBattle_branch_e9bad:
 	intensity $b2
 	octave 3
 	note C_, 6
@@ -62,7 +61,7 @@ Music_RocketBattle_branch_e9bad: ; e9bad
 	note C_, 6
 	intensity $b7
 	note D_, 4
-Music_RocketBattle_branch_e9bc1: ; e9bc1
+Music_RocketBattle_branch_e9bc1:
 	intensity $b2
 	octave 4
 	note E_, 6
@@ -116,7 +115,7 @@ Music_RocketBattle_branch_e9bc1: ; e9bc1
 	note D#, 2
 	note D_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9c02: ; e9c02
+Music_RocketBattle_branch_e9c02:
 	octave 4
 	note E_, 2
 	octave 3
@@ -291,7 +290,7 @@ Music_RocketBattle_branch_e9c02: ; e9c02
 	intensity $b7
 	note A#, 2
 	note G_, 4
-Music_RocketBattle_branch_e9cc5: ; e9cc5
+Music_RocketBattle_branch_e9cc5:
 	intensity $b2
 	note F_, 6
 	note F_, 4
@@ -389,9 +388,8 @@ Music_RocketBattle_branch_e9cc5: ; e9cc5
 	note D_, 2
 	note F_, 2
 	loopchannel 0, Music_RocketBattle_branch_e9c02
-; e9d3e
 
-Music_RocketBattle_Ch2: ; e9d3e
+Music_RocketBattle_Ch2:
 	dutycycle $3
 	vibrato $8, $36
 	tone $0001
@@ -438,7 +436,7 @@ Music_RocketBattle_Ch2: ; e9d3e
 	note G#, 1
 	note A_, 1
 	note G#, 1
-Music_RocketBattle_branch_e9d7b: ; e9d7b
+Music_RocketBattle_branch_e9d7b:
 	intensity $c2
 	octave 3
 	note A_, 6
@@ -454,7 +452,7 @@ Music_RocketBattle_branch_e9d7b: ; e9d7b
 	note A_, 6
 	intensity $4a
 	note G#, 4
-Music_RocketBattle_branch_e9d91: ; e9d91
+Music_RocketBattle_branch_e9d91:
 	intensity $c2
 	octave 4
 	note A_, 6
@@ -476,7 +474,7 @@ Music_RocketBattle_branch_e9d91: ; e9d91
 	note F_, 16
 	intensity $b7
 	note F_, 16
-Music_RocketBattle_branch_e9db1: ; e9db1
+Music_RocketBattle_branch_e9db1:
 	callchannel Music_RocketBattle_branch_e9ea0
 	intensity $b0
 	note F_, 8
@@ -605,7 +603,7 @@ Music_RocketBattle_branch_e9db1: ; e9db1
 	note G_, 1
 	note G#, 1
 	note A_, 8
-Music_RocketBattle_branch_e9e5a: ; e9e5a
+Music_RocketBattle_branch_e9e5a:
 	intensity $c2
 	octave 3
 	note A#, 6
@@ -657,9 +655,8 @@ Music_RocketBattle_branch_e9e5a: ; e9e5a
 	intensity $c7
 	note A#, 8
 	loopchannel 0, Music_RocketBattle_branch_e9db1
-; e9ea0
 
-Music_RocketBattle_branch_e9ea0: ; e9ea0
+Music_RocketBattle_branch_e9ea0:
 	intensity $c6
 	octave 4
 	note A_, 6
@@ -669,9 +666,8 @@ Music_RocketBattle_branch_e9ea0: ; e9ea0
 	note G#, 6
 	note E_, 4
 	endchannel
-; e9eaa
 
-Music_RocketBattle_Ch3: ; e9eaa
+Music_RocketBattle_Ch3:
 	notetype $c, $19
 	octave 3
 	note A_, 2
@@ -704,7 +700,7 @@ Music_RocketBattle_Ch3: ; e9eaa
 	octave 2
 	note B_, 2
 	note A#, 2
-Music_RocketBattle_branch_e9ecc: ; e9ecc
+Music_RocketBattle_branch_e9ecc:
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9ecc
 	octave 2
@@ -719,7 +715,7 @@ Music_RocketBattle_branch_e9ecc: ; e9ecc
 	note F_, 2
 	note E_, 2
 	note D_, 2
-Music_RocketBattle_branch_e9edf: ; e9edf
+Music_RocketBattle_branch_e9edf:
 	callchannel Music_RocketBattle_branch_e9fe6
 	loopchannel 3, Music_RocketBattle_branch_e9edf
 	octave 2
@@ -740,7 +736,7 @@ Music_RocketBattle_branch_e9edf: ; e9edf
 	octave 3
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
-Music_RocketBattle_branch_e9efe: ; e9efe
+Music_RocketBattle_branch_e9efe:
 	callchannel Music_RocketBattle_branch_e9ff3
 	callchannel Music_RocketBattle_branch_ea010
 	octave 3
@@ -774,7 +770,7 @@ Music_RocketBattle_branch_e9efe: ; e9efe
 	note A_, 2
 	octave 3
 	note E_, 2
-Music_RocketBattle_branch_e9f25: ; e9f25
+Music_RocketBattle_branch_e9f25:
 	octave 2
 	note A#, 2
 	octave 3
@@ -807,7 +803,7 @@ Music_RocketBattle_branch_e9f25: ; e9f25
 	note D_, 2
 	callchannel Music_RocketBattle_branch_ea02a
 	callchannel Music_RocketBattle_branch_ea02a
-Music_RocketBattle_branch_e9f4e: ; e9f4e
+Music_RocketBattle_branch_e9f4e:
 	octave 2
 	note A_, 2
 	octave 3
@@ -833,7 +829,7 @@ Music_RocketBattle_branch_e9f4e: ; e9f4e
 	note A_, 2
 	note G_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9f6a: ; e9f6a
+Music_RocketBattle_branch_e9f6a:
 	octave 2
 	note A#, 2
 	octave 3
@@ -849,7 +845,7 @@ Music_RocketBattle_branch_e9f6a: ; e9f6a
 	note D_, 2
 	note C#, 2
 	note D_, 2
-Music_RocketBattle_branch_e9f7c: ; e9f7c
+Music_RocketBattle_branch_e9f7c:
 	octave 2
 	note A_, 2
 	octave 3
@@ -863,7 +859,7 @@ Music_RocketBattle_branch_e9f7c: ; e9f7c
 	note C_, 2
 	octave 2
 	note A#, 2
-Music_RocketBattle_branch_e9f8c: ; e9f8c
+Music_RocketBattle_branch_e9f8c:
 	octave 2
 	note A_, 2
 	octave 3
@@ -879,7 +875,7 @@ Music_RocketBattle_branch_e9f8c: ; e9f8c
 	note A_, 2
 	note G_, 2
 	note A#, 2
-Music_RocketBattle_branch_e9f9e: ; e9f9e
+Music_RocketBattle_branch_e9f9e:
 	octave 2
 	note A#, 2
 	octave 3
@@ -887,7 +883,7 @@ Music_RocketBattle_branch_e9f9e: ; e9f9e
 	loopchannel 7, Music_RocketBattle_branch_e9f9e
 	note E_, 2
 	note F_, 2
-Music_RocketBattle_branch_e9fa8: ; e9fa8
+Music_RocketBattle_branch_e9fa8:
 	octave 2
 	note A#, 2
 	octave 3
@@ -932,9 +928,8 @@ Music_RocketBattle_branch_e9fa8: ; e9fa8
 	note F_, 2
 	callchannel Music_RocketBattle_branch_ea01d
 	loopchannel 0, Music_RocketBattle_branch_e9efe
-; e9fe6
 
-Music_RocketBattle_branch_e9fe6: ; e9fe6
+Music_RocketBattle_branch_e9fe6:
 	octave 2
 	note A_, 2
 	octave 3
@@ -948,9 +943,8 @@ Music_RocketBattle_branch_e9fe6: ; e9fe6
 	note G_, 2
 	note F_, 2
 	endchannel
-; e9ff3
 
-Music_RocketBattle_branch_e9ff3: ; e9ff3
+Music_RocketBattle_branch_e9ff3:
 	octave 2
 	note A_, 2
 	octave 3
@@ -980,9 +974,8 @@ Music_RocketBattle_branch_e9ff3: ; e9ff3
 	note D#, 2
 	note D_, 2
 	endchannel
-; ea010
 
-Music_RocketBattle_branch_ea010: ; ea010
+Music_RocketBattle_branch_ea010:
 	octave 2
 	note A#, 2
 	octave 3
@@ -996,9 +989,8 @@ Music_RocketBattle_branch_ea010: ; ea010
 	octave 2
 	note A#, 2
 	endchannel
-; ea01d
 
-Music_RocketBattle_branch_ea01d: ; ea01d
+Music_RocketBattle_branch_ea01d:
 	octave 2
 	note A#, 2
 	octave 3
@@ -1012,18 +1004,16 @@ Music_RocketBattle_branch_ea01d: ; ea01d
 	octave 3
 	note F_, 2
 	endchannel
-; ea02a
 
-Music_RocketBattle_branch_ea02a: ; ea02a
+Music_RocketBattle_branch_ea02a:
 	octave 2
 	note A_, 2
 	octave 3
 	note E_, 2
 	loopchannel 4, Music_RocketBattle_branch_ea02a
 	endchannel
-; ea033
 
-Music_RocketBattle_branch_ea033: ; ea033
+Music_RocketBattle_branch_ea033:
 	octave 2
 	note A_, 2
 	octave 3
@@ -1037,4 +1027,3 @@ Music_RocketBattle_branch_ea033: ; ea033
 	octave 2
 	note A_, 2
 	endchannel
-; ea040

audio/music/rockethideout.asm

@@ -1,11 +1,10 @@
-Music_RocketHideout: ; eeb75
+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
-; eeb81
 
-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,4 +305,3 @@ Music_RocketHideout_branch_eecdb: ; eecdb
 	stereopanning $f0
 	note A_, 4
 	endchannel
-; eece8

audio/music/rockettheme.asm

@@ -1,11 +1,10 @@
-Music_RocketTheme: ; f766d
+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
-; f7679
 
-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,4 +472,3 @@ Music_RocketTheme_branch_f78de: ; f78de
 	callchannel Music_RocketTheme_branch_f765c
 	callchannel Music_RocketTheme_branch_f765c
 	loopchannel 0, Music_RocketTheme_branch_f78c3
-; f78fd

audio/music/route1.asm

@@ -1,12 +1,11 @@
-Music_Route1: ; ec000
+Music_Route1:
 	musicheader 3, 1, Music_Route1_Ch1
 	musicheader 1, 2, Music_Route1_Ch2
 	musicheader 1, 3, Music_Route1_Ch3
-; ec009
 
 	db $3
 
-Music_Route1_Ch1: ; ec00a
+Music_Route1_Ch1:
 	stereopanning $f
 	tempo 184
 	volume $77
@@ -60,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
@@ -203,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
@@ -232,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
@@ -323,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
@@ -342,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
@@ -363,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
@@ -380,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
@@ -462,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
@@ -650,4 +644,3 @@ Music_Route1_branch_ec20c: ; ec20c
 	note A_, 1
 	note __, 3
 	loopchannel 0, Music_Route1_branch_ec20c
-; ec2ca

audio/music/route12.asm

@@ -1,11 +1,10 @@
-Music_Route12: ; ec506
+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
-; ec512
 
-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,4 +448,3 @@ Music_Route12_branch_ec717: ; ec717
 	note C#, 1
 	note C#, 1
 	endchannel
-; ec720

audio/music/route2.asm

@@ -1,11 +1,10 @@
-Music_Route2: ; ed8dd
+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
-; ed8e9
 
-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,4 +512,3 @@ Music_Route2_branch_edb17: ; edb17
 	note D_, 2
 	note D#, 4
 	loopchannel 0, Music_Route2_branch_edaef
-; edb29

audio/music/route26.asm

@@ -1,11 +1,10 @@
-Music_Route26: ; eefb2
+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
-; eefbe
 
-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,4 +663,3 @@ Music_Route26_branch_ef2b0: ; ef2b0
 	note D_, 2
 	note E_, 2
 	endchannel
-; ef2d0

audio/music/route29.asm

@@ -1,11 +1,10 @@
-Music_Route29: ; f0386
+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
-; f0392
 
-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,4 +518,3 @@ Music_Route29_branch_f05b0: ; f05b0
 	note F_, 2
 	note F_, 4
 	loopchannel 0, Music_Route29_branch_f05b0
-; f05bf

audio/music/route3.asm

@@ -1,11 +1,10 @@
-Music_Route3: ; ec2ca
+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
-; ec2d6
 
-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,4 +499,3 @@ Music_Route3_branch_ec4f0: ; ec4f0
 	note C#, 1
 	note C#, 1
 	loopchannel 0, Music_Route3_branch_ec4f0
-; ec506

audio/music/route30.asm

@@ -1,11 +1,10 @@
-Music_Route30: ; efc01
+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
-; efc0d
 
-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,4 +667,3 @@ Music_Route30_branch_efee1: ; efee1
 	note D_, 1
 	notetype $c
 	endchannel
-; efef5

audio/music/route36.asm

@@ -1,11 +1,10 @@
-Music_Route36: ; e94e9
+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
-; e94f5
 
-Music_Route36_Ch1: ; e94f5
+Music_Route36_Ch1:
 	tempo 144
 	volume $77
 	dutycycle $3
@@ -26,7 +25,7 @@ Music_Route36_Ch1: ; e94f5
 	note A_, 1
 	intensity $5d
 	note A#, 4
-Music_Route36_branch_e9517: ; e9517
+Music_Route36_branch_e9517:
 	intensity $b5
 	note F_, 4
 	note A_, 2
@@ -163,9 +162,8 @@ Music_Route36_branch_e9517: ; e9517
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9517
-; e95af
 
-Music_Route36_Ch2: ; e95af
+Music_Route36_Ch2:
 	dutycycle $3
 	vibrato $10, $36
 	stereopanning $f0
@@ -188,7 +186,7 @@ Music_Route36_Ch2: ; e95af
 	note F_, 8
 	octave 3
 	note G_, 4
-Music_Route36_branch_e95ce: ; e95ce
+Music_Route36_branch_e95ce:
 	intensity $c7
 	octave 4
 	note C_, 10
@@ -311,9 +309,8 @@ Music_Route36_branch_e95ce: ; e95ce
 	note A_, 1
 	note B_, 1
 	loopchannel 0, Music_Route36_branch_e95ce
-; e966b
 
-Music_Route36_Ch3: ; e966b
+Music_Route36_Ch3:
 	notetype $c, $25
 	octave 3
 	note F_, 1
@@ -337,7 +334,7 @@ Music_Route36_Ch3: ; e966b
 	octave 3
 	note D#, 2
 	note E_, 2
-Music_Route36_branch_e9684: ; e9684
+Music_Route36_branch_e9684:
 	note F_, 4
 	note C_, 2
 	note F_, 4
@@ -468,20 +465,19 @@ Music_Route36_branch_e9684: ; e9684
 	note D#, 2
 	note E_, 2
 	loopchannel 0, Music_Route36_branch_e9684
-; e9709
 
-Music_Route36_Ch4: ; e9709
+Music_Route36_Ch4:
 	togglenoise $1
 	notetype $c
 	callchannel Music_Route36_branch_e9734
 	callchannel Music_Route36_branch_e9741
-Music_Route36_branch_e9713: ; e9713
+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: ; e9723
+Music_Route36_branch_e9723:
 	note A#, 4
 	note A_, 2
 	note F_, 4
@@ -491,9 +487,8 @@ Music_Route36_branch_e9723: ; e9723
 	loopchannel 11, Music_Route36_branch_e9723
 	callchannel Music_Route36_branch_e9741
 	loopchannel 0, Music_Route36_branch_e9713
-; e9734
 
-Music_Route36_branch_e9734: ; e9734
+Music_Route36_branch_e9734:
 	note A_, 4
 	note A_, 6
 	note A#, 1
@@ -501,18 +496,16 @@ Music_Route36_branch_e9734: ; e9734
 	note A_, 2
 	note A#, 2
 	endchannel
-; e973b
 
-Music_Route36_branch_e973b: ; e973b
+Music_Route36_branch_e973b:
 	note A_, 4
 	note A_, 6
 	note B_, 1
 	note A#, 1
 	note A_, 4
 	endchannel
-; e9741
 
-Music_Route36_branch_e9741: ; e9741
+Music_Route36_branch_e9741:
 	note A_, 4
 	note A_, 6
 	note A#, 1
@@ -525,4 +518,3 @@ Music_Route36_branch_e9741: ; e9741
 	note A_, 1
 	notetype $c
 	endchannel
-; e974f

audio/music/route37.asm

@@ -1,11 +1,10 @@
-Music_Route37: ; ee94b
+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
-; ee957
 
-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,4 +425,3 @@ Music_Route37_branch_eeb6b: ; eeb6b
 	note D#, 1
 	note D#, 1
 	endchannel
-; eeb75

audio/music/ruinsofalphinterior.asm

@@ -1,10 +1,9 @@
-Music_RuinsOfAlphInterior: ; ebd9e
+Music_RuinsOfAlphInterior:
 	musicheader 3, 1, Music_RuinsOfAlphInterior_Ch1
 	musicheader 1, 2, Music_RuinsOfAlphInterior_Ch2
 	musicheader 1, 3, Music_RuinsOfAlphInterior_Ch3
-; ebda7
 
-Music_RuinsOfAlphInterior_Ch1: ; ebda7
+Music_RuinsOfAlphInterior_Ch1:
 	tempo 224
 	volume $77
 	dutycycle $0
@@ -12,14 +11,13 @@ Music_RuinsOfAlphInterior_Ch1: ; ebda7
 	notetype $c, $44
 	note __, 1
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
-; ebdb8
 
-Music_RuinsOfAlphInterior_Ch2: ; ebdb8
+Music_RuinsOfAlphInterior_Ch2:
 	tone $0002
 	dutycycle $0
 	stereopanning $f
 	notetype $c, $a4
-Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
+Music_RuinsOfAlphInterior_branch_ebdc2:
 	octave 4
 	note C_, 4
 	octave 3
@@ -35,11 +33,10 @@ Music_RuinsOfAlphInterior_branch_ebdc2: ; ebdc2
 	octave 3
 	note A#, 4
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdc2
-; ebdd4
 
-Music_RuinsOfAlphInterior_Ch3: ; ebdd4
+Music_RuinsOfAlphInterior_Ch3:
 	notetype $c, $10
-Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
+Music_RuinsOfAlphInterior_branch_ebdd7:
 	octave 2
 	note G#, 2
 	octave 3
@@ -47,4 +44,3 @@ Music_RuinsOfAlphInterior_branch_ebdd7: ; ebdd7
 	note E_, 2
 	note __, 10
 	loopchannel 0, Music_RuinsOfAlphInterior_branch_ebdd7
-; ebde1

audio/music/ruinsofalphradio.asm

@@ -1,17 +1,16 @@
-Music_RuinsOfAlphRadio: ; eedcb
+Music_RuinsOfAlphRadio:
 	musicheader 3, 1, Music_RuinsOfAlphRadio_Ch1
 	musicheader 1, 2, Music_RuinsOfAlphRadio_Ch2
 	musicheader 1, 3, Music_RuinsOfAlphRadio_Ch3
-; eedd4
 
-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,15 +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

audio/music/showmearound.asm

@@ -1,11 +1,10 @@
-Music_ShowMeAround: ; edbd8
+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
-; edbe4
 
-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,4 +347,3 @@ Music_ShowMeAround_branch_edd5e: ; edd5e
 	note D_, 2
 	note F#, 2
 	endchannel
-; edd6d

audio/music/sprouttower.asm

@@ -1,11 +1,10 @@
-Music_SproutTower: ; f6974
+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
-; f6980
 
-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,4 +240,3 @@ Music_SproutTower_branch_f6a7f: ; f6a7f
 	stereopanning $ff
 	note F#, 4
 	loopchannel 0, Music_SproutTower_branch_f6a7f
-; f6a99

audio/music/ssaqua.asm

@@ -1,11 +1,10 @@
-Music_SSAqua: ; ead99
+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
-; eada5
 
-Music_SSAqua_Ch1: ; eada5
+Music_SSAqua_Ch1:
 	tempo 117
 	volume $77
 	stereopanning $f
@@ -18,7 +17,7 @@ Music_SSAqua_Ch1: ; eada5
 	note __, 1
 	note G_, 1
 	note __, 1
-Music_SSAqua_branch_eadbc: ; eadbc
+Music_SSAqua_branch_eadbc:
 	octave 2
 	note G_, 16
 	note __, 8
@@ -248,15 +247,14 @@ Music_SSAqua_branch_eadbc: ; eadbc
 	note F#, 2
 	note A_, 2
 	loopchannel 0, Music_SSAqua_branch_eadbc
-; eaeca
 
-Music_SSAqua_Ch2: ; eaeca
+Music_SSAqua_Ch2:
 	stereopanning $f0
 	dutycycle $2
 	vibrato $8, $33
 	notetype $c, $b7
 	note __, 2
-Music_SSAqua_branch_eaed5: ; eaed5
+Music_SSAqua_branch_eaed5:
 	notetype $c, $b7
 	dutycycle $1
 	intensity $61
@@ -392,9 +390,8 @@ Music_SSAqua_branch_eaed5: ; eaed5
 	note A_, 8
 	note __, 8
 	loopchannel 0, Music_SSAqua_branch_eaed5
-; eaf88
 
-Music_SSAqua_branch_eaf88: ; eaf88
+Music_SSAqua_branch_eaf88:
 	note D_, 6
 	octave 3
 	note B_, 1
@@ -468,9 +465,8 @@ Music_SSAqua_branch_eaf88: ; eaf88
 	note E_, 2
 	note F#, 2
 	endchannel
-; eafd5
 
-Music_SSAqua_branch_eafd5: ; eafd5
+Music_SSAqua_branch_eafd5:
 	notetype $c, $b7
 	note B_, 10
 	note F#, 1
@@ -480,9 +476,8 @@ Music_SSAqua_branch_eafd5: ; eafd5
 	note F#, 1
 	note __, 1
 	endchannel
-; eafe0
 
-Music_SSAqua_branch_eafe0: ; eafe0
+Music_SSAqua_branch_eafe0:
 	octave 3
 	note D_, 10
 	note E_, 1
@@ -504,9 +499,8 @@ Music_SSAqua_branch_eafe0: ; eafe0
 	note A_, 1
 	note __, 1
 	endchannel
-; eaff5
 
-Music_SSAqua_branch_eaff5: ; eaff5
+Music_SSAqua_branch_eaff5:
 	octave 5
 	note G_, 1
 	note D_, 1
@@ -580,9 +574,8 @@ Music_SSAqua_branch_eaff5: ; eaff5
 	note A_, 1
 	note G_, 1
 	endchannel
-; eb03e
 
-Music_SSAqua_branch_eb03e: ; eb03e
+Music_SSAqua_branch_eb03e:
 	octave 5
 	note G_, 1
 	octave 4
@@ -607,9 +600,8 @@ Music_SSAqua_branch_eb03e: ; eb03e
 	octave 3
 	note G_, 1
 	endchannel
-; eb056
 
-Music_SSAqua_Ch3: ; eb056
+Music_SSAqua_Ch3:
 	stereopanning $ff
 	vibrato $8, $34
 	notetype $6, $15
@@ -618,7 +610,7 @@ Music_SSAqua_Ch3: ; eb056
 	note __, 1
 	note G_, 1
 	note __, 1
-Music_SSAqua_branch_eb063: ; eb063
+Music_SSAqua_branch_eb063:
 	note G_, 16
 	note __, 8
 	note G_, 2
@@ -651,7 +643,7 @@ Music_SSAqua_branch_eb063: ; eb063
 	note E_, 1
 	callchannel Music_SSAqua_branch_eb14d
 	callchannel Music_SSAqua_branch_eb14d
-Music_SSAqua_branch_eb08d: ; eb08d
+Music_SSAqua_branch_eb08d:
 	note G_, 2
 	note __, 2
 	octave 3
@@ -830,9 +822,8 @@ Music_SSAqua_branch_eb08d: ; eb08d
 	note G_, 1
 	note __, 1
 	loopchannel 0, Music_SSAqua_branch_eb063
-; eb14d
 
-Music_SSAqua_branch_eb14d: ; eb14d
+Music_SSAqua_branch_eb14d:
 	notetype $6, $15
 	octave 2
 	note G_, 2
@@ -868,9 +859,8 @@ Music_SSAqua_branch_eb14d: ; eb14d
 	note G_, 1
 	note __, 1
 	endchannel
-; eb172
 
-Music_SSAqua_branch_eb172: ; eb172
+Music_SSAqua_branch_eb172:
 	octave 2
 	note G_, 2
 	note __, 2
@@ -1061,9 +1051,8 @@ Music_SSAqua_branch_eb172: ; eb172
 	note F#, 1
 	note __, 3
 	endchannel
-; eb230
 
-Music_SSAqua_branch_eb230: ; eb230
+Music_SSAqua_branch_eb230:
 	octave 2
 	note B_, 2
 	note __, 2
@@ -1089,13 +1078,12 @@ Music_SSAqua_branch_eb230: ; eb230
 	note D#, 1
 	note __, 3
 	endchannel
-; eb249
 
-Music_SSAqua_Ch4: ; eb249
+Music_SSAqua_Ch4:
 	togglenoise $3
 	notetype $c
 	note __, 2
-Music_SSAqua_branch_eb24e: ; eb24e
+Music_SSAqua_branch_eb24e:
 	note G#, 1
 	note G_, 1
 	note G_, 1
@@ -1138,9 +1126,8 @@ Music_SSAqua_branch_eb24e: ; eb24e
 	callchannel Music_SSAqua_branch_eb2ae
 	callchannel Music_SSAqua_branch_eb2c7
 	loopchannel 0, Music_SSAqua_branch_eb24e
-; eb2ae
 
-Music_SSAqua_branch_eb2ae: ; eb2ae
+Music_SSAqua_branch_eb2ae:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1154,9 +1141,8 @@ Music_SSAqua_branch_eb2ae: ; eb2ae
 	note G_, 1
 	note G_, 1
 	endchannel
-; eb2bb
 
-Music_SSAqua_branch_eb2bb: ; eb2bb
+Music_SSAqua_branch_eb2bb:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1169,9 +1155,8 @@ Music_SSAqua_branch_eb2bb: ; eb2bb
 	note D_, 2
 	note F#, 2
 	endchannel
-; eb2c7
 
-Music_SSAqua_branch_eb2c7: ; eb2c7
+Music_SSAqua_branch_eb2c7:
 	note A#, 2
 	note G_, 1
 	note G_, 1
@@ -1184,4 +1169,3 @@ Music_SSAqua_branch_eb2c7: ; eb2c7
 	note D_, 2
 	note C_, 2
 	endchannel
-; eb2d3

audio/music/successfulcapture.asm

@@ -1,26 +1,22 @@
-Music_SuccessfulCapture: ; f4602
+Music_SuccessfulCapture:
 	musicheader 3, 1, Music_SuccessfulCapture_Ch1
 	musicheader 1, 2, Music_SuccessfulCapture_Ch2
 	musicheader 1, 3, Music_SuccessfulCapture_Ch3
-; f460b
 
-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

audio/music/suicunebattle.asm

@@ -1,10 +1,9 @@
-Music_SuicuneBattle: ; 178b81
+Music_SuicuneBattle:
 	musicheader 3, 1, Music_SuicuneBattle_Ch1
 	musicheader 1, 2, Music_SuicuneBattle_Ch2
 	musicheader 1, 3, Music_SuicuneBattle_Ch3
-; 178b8a
 
-Music_SuicuneBattle_Ch1: ; 178b8a
+Music_SuicuneBattle_Ch1:
 	tempo 101
 	volume $77
 	dutycycle $3
@@ -95,7 +94,7 @@ Music_SuicuneBattle_Ch1: ; 178b8a
 	octave 3
 	note E_, 1
 	note G#, 1
-Music_SuicuneBattle_branch_178bfc: ; 178bfc
+Music_SuicuneBattle_branch_178bfc:
 	notetype $c, $b4
 	octave 2
 	note A_, 2
@@ -511,9 +510,8 @@ Music_SuicuneBattle_branch_178bfc: ; 178bfc
 	vibrato $12, $15
 	dutycycle $3
 	loopchannel 0, Music_SuicuneBattle_branch_178bfc
-; 178dec
 
-Music_SuicuneBattle_Ch2: ; 178dec
+Music_SuicuneBattle_Ch2:
 	dutycycle $3
 	vibrato $14, $34
 	tone $0001
@@ -591,7 +589,7 @@ Music_SuicuneBattle_Ch2: ; 178dec
 	note E_, 8
 	note E_, 8
 	note E_, 4
-Music_SuicuneBattle_branch_178e4e: ; 178e4e
+Music_SuicuneBattle_branch_178e4e:
 	notetype $c, $c7
 	octave 3
 	note A_, 8
@@ -1187,9 +1185,8 @@ Music_SuicuneBattle_branch_178e4e: ; 178e4e
 	note A_, 2
 	note B_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_178e4e
-; 179122
 
-Music_SuicuneBattle_Ch3: ; 179122
+Music_SuicuneBattle_Ch3:
 	notetype $c, $18
 	note __, 16
 	note __, 4
@@ -1282,7 +1279,7 @@ Music_SuicuneBattle_Ch3: ; 179122
 	note D_, 2
 	note E_, 2
 	notetype $c, $16
-Music_SuicuneBattle_branch_179182: ; 179182
+Music_SuicuneBattle_branch_179182:
 	octave 1
 	note A_, 2
 	octave 2
@@ -2057,4 +2054,3 @@ Music_SuicuneBattle_branch_179182: ; 179182
 	note D_, 2
 	note E_, 2
 	loopchannel 0, Music_SuicuneBattle_branch_179182
-; 17948b