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)
+- [I can't build the ROM, `make` just prints an error!](#i-cant-build-the-rom-make-just-prints-an-error)
-- [Can't build ROM; "Segmentation fault" from `rgbgfx`](#cant-build-rom-segmentation-fault-from-rgbgfx)
+  - [`gcc`: command not found](#gcc-command-not-found)
-- [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)
+  - ["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].
 
-
+### "Section is too big" or "Unable to place section in bank"
-## Can't build ROM; "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/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