remove address comments

audio.asm

@@ -455,7 +455,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81
 
 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
 
-Music_DoLowHealthAlarm:: ; 2136e (8:536e)
+Music_DoLowHealthAlarm::
 	ld a, [wLowHealthAlarm]
 	cp $ff
 	jr z, .disableAlarm
@@ -537,7 +537,7 @@ INCLUDE "engine/menu/bills_pc.asm"
 INCLUDE "audio/engine_2.asm"
 
 
-Music_PokeFluteInBattle:: ; 22306 (8:6306)
+Music_PokeFluteInBattle::
 	; begin playing the "caught mon" sound effect
 	ld a, SFX_CAUGHT_MON
 	call PlaySoundWaitForCurrent
@@ -549,7 +549,7 @@ Music_PokeFluteInBattle:: ; 22306 (8:6306)
 	call Audio2_OverwriteChannelPointer
 	ld de, SFX_08_PokeFlute_Ch3
 
-Audio2_OverwriteChannelPointer: ; 2231d (8:631d)
+Audio2_OverwriteChannelPointer:
 	ld a, e
 	ld [hli], a
 	ld a, d
@@ -559,7 +559,7 @@ Audio2_OverwriteChannelPointer: ; 2231d (8:631d)
 
 SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
 
-PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
+PlayPokedexRatingSfx::
 	ld a, [$ffdc]
 	ld c, $0
 	ld hl, OwnedMonValues
@@ -584,7 +584,7 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
 	call PlayMusic
 	jp PlayDefaultMusic
 
-PokedexRatingSfxPointers: ; 7d162 (1f:5162)
+PokedexRatingSfxPointers:
 	db SFX_DENIED,         BANK(SFX_Denied_3)
 	db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1)
 	db SFX_GET_ITEM_1,     BANK(SFX_Get_Item1_1)
@@ -593,7 +593,7 @@ PokedexRatingSfxPointers: ; 7d162 (1f:5162)
 	db SFX_GET_KEY_ITEM,   BANK(SFX_Get_Key_Item_1)
 	db SFX_GET_ITEM_2,     BANK(SFX_Get_Item2_1)
 
-OwnedMonValues: ; 7d170 (1f:5170)
+OwnedMonValues:
 	db 10, 40, 60, 90, 120, 150, $ff
 
 

audio/engine_2.asm

@@ -1,6 +1,6 @@
 ; The second of three duplicated sound engines.
 
-Audio2_UpdateMusic:: ; 21879 (8:5879)
+Audio2_UpdateMusic::
 	ld c, CH0
 .loop
 	ld b, $0
@@ -42,7 +42,7 @@ Audio2_UpdateMusic:: ; 21879 (8:5879)
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Audio2_ApplyMusicAffects: ; 218ae (8:58ae)
+Audio2_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
@@ -148,7 +148,7 @@ Audio2_ApplyMusicAffects: ; 218ae (8:58ae)
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Audio2_PlayNextNote: ; 21946 (8:5946)
+Audio2_PlayNextNote:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
@@ -169,7 +169,7 @@ Audio2_PlayNextNote: ; 21946 (8:5946)
 	call Audio2_endchannel
 	ret
 
-Audio2_endchannel: ; 21967 (8:5967)
+Audio2_endchannel:
 	call Audio2_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
@@ -258,7 +258,7 @@ Audio2_endchannel: ; 21967 (8:5967)
 	ld [hl], b
 	ret
 
-Audio2_callchannel: ; 219f5 (8:59f5)
+Audio2_callchannel:
 	cp $fd ; is this command a callchannel?
 	jp nz, Audio2_loopchannel ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -295,7 +295,7 @@ Audio2_callchannel: ; 219f5 (8:59f5)
 	set 1, [hl] ; set the call flag
 	jp Audio2_endchannel
 
-Audio2_loopchannel: ; 21a2a (8:5a2a)
+Audio2_loopchannel:
 	cp $fe ; is this command a loopchannel?
 	jp nz, Audio2_notetype ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -333,7 +333,7 @@ Audio2_loopchannel: ; 21a2a (8:5a2a)
 	ld [hl], b
 	jp Audio2_endchannel
 
-Audio2_notetype: ; 21a65 (8:5a65)
+Audio2_notetype:
 	and $f0
 	cp $d0 ; is this command a notetype?
 	jp nz, Audio2_toggleperfectpitch ; no
@@ -377,7 +377,7 @@ Audio2_notetype: ; 21a65 (8:5a65)
 .noiseChannel
 	jp Audio2_endchannel
 
-Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4)
+Audio2_toggleperfectpitch:
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio2_vibrato ; no
@@ -389,7 +389,7 @@ Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4)
 	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio2_endchannel
 
-Audio2_vibrato: ; 21ab6 (8:5ab6)
+Audio2_vibrato:
 	cp $ea ; is this command a vibrato?
 	jr nz, Audio2_pitchbend ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -423,7 +423,7 @@ Audio2_vibrato: ; 21ab6 (8:5ab6)
 	ld [hl], a ; store depth as both high and low nibbles
 	jp Audio2_endchannel
 
-Audio2_pitchbend: ; 21aee (8:5aee)
+Audio2_pitchbend:
 	cp $eb ; is this command a pitchbend?
 	jr nz, Audio2_duty ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -454,7 +454,7 @@ Audio2_pitchbend: ; 21aee (8:5aee)
 	ld d, a
 	jp Audio2_notelength
 
-Audio2_duty: ; 21b26 (8:5b26)
+Audio2_duty:
 	cp $ec ; is this command a duty?
 	jr nz, Audio2_tempo ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -467,7 +467,7 @@ Audio2_duty: ; 21b26 (8:5b26)
 	ld [hl], a ; store duty
 	jp Audio2_endchannel
 
-Audio2_tempo: ; 21b3b (8:5b3b)
+Audio2_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
@@ -496,7 +496,7 @@ Audio2_tempo: ; 21b3b (8:5b3b)
 .musicChannelDone
 	jp Audio2_endchannel
 
-Audio2_stereopanning: ; 21b7b (8:5b7b)
+Audio2_stereopanning:
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio2_unknownmusic0xef ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -504,7 +504,7 @@ Audio2_stereopanning: ; 21b7b (8:5b7b)
 	jp Audio2_endchannel
 
 ; this appears to never be used
-Audio2_unknownmusic0xef: ; 21b88 (8:5b88)
+Audio2_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Audio2_dutycycle ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -521,7 +521,7 @@ Audio2_unknownmusic0xef: ; 21b88 (8:5b88)
 .skip
 	jp Audio2_endchannel
 
-Audio2_dutycycle: ; 21ba7 (8:5ba7)
+Audio2_dutycycle:
 	cp $fc ; is this command a dutycycle?
 	jr nz, Audio2_volume ; no
 	call Audio2_GetNextMusicByte ; yes
@@ -538,14 +538,14 @@ Audio2_dutycycle: ; 21ba7 (8:5ba7)
 	set 6, [hl] ; set dutycycle flag
 	jp Audio2_endchannel
 
-Audio2_volume: ; 21bc5 (8:5bc5)
+Audio2_volume:
 	cp $f0 ; is this command a volume?
 	jr nz, Audio2_executemusic ; no
 	call Audio2_GetNextMusicByte ; yes
 	ld [rNR50], a ; store volume
 	jp Audio2_endchannel
 
-Audio2_executemusic: ; 21bd1 (8:5bd1)
+Audio2_executemusic:
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio2_octave ; no
 	ld b, $0 ; yes
@@ -554,7 +554,7 @@ Audio2_executemusic: ; 21bd1 (8:5bd1)
 	set 0, [hl]
 	jp Audio2_endchannel
 
-Audio2_octave: ; 21be0 (8:5be0)
+Audio2_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio2_unknownsfx0x20 ; no
@@ -611,7 +611,7 @@ Audio2_unknownsfx0x20: ; 21bf3
 	call Audio2_21dcc
 	ret
 
-Audio2_unknownsfx0x10: ; 21c40 (8:5c40)
+Audio2_unknownsfx0x10:
 	ld a, c
 	cp CH4
 	jr c, Audio2_note ; if not a sfx
@@ -627,7 +627,7 @@ Audio2_unknownsfx0x10: ; 21c40 (8:5c40)
 	ld [rNR10], a
 	jp Audio2_endchannel
 
-Audio2_note: ; 21c5c (8:5c5c)
+Audio2_note:
 	ld a, c
 	cp CH3
 	jr nz, Audio2_notelength ; if not noise channel
@@ -646,7 +646,7 @@ Audio2_note: ; 21c5c (8:5c5c)
 	push bc
 	jr asm_21c7e
 
-Audio2_dnote: ; 21c76 (8:5c76)
+Audio2_dnote:
 	ld a, d
 	and $f
 	push af
@@ -663,7 +663,7 @@ asm_21c7e
 	pop bc
 	pop de
 
-Audio2_notelength: ; 21c8b (8:5c8b)
+Audio2_notelength:
 	ld a, d
 	push af
 	and $f
@@ -721,7 +721,7 @@ Audio2_notelength: ; 21c8b (8:5c8b)
 	pop hl
 	ret
 
-Audio2_notepitch: ; 21ce9 (8:5ce9)
+Audio2_notepitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -814,7 +814,7 @@ Audio2_notepitch: ; 21ce9 (8:5ce9)
 	call Audio2_21dcc
 	ret
 
-Audio2_21d79: ; 21d79 (8:5d79)
+Audio2_21d79:
 	ld b, $0
 	ld hl, Unknown_222e6
 	add hl, bc
@@ -848,7 +848,7 @@ Audio2_21d79: ; 21d79 (8:5d79)
 	ld [rNR51], a
 	ret
 
-Audio2_21daa: ; 21daa (8:5daa)
+Audio2_21daa:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
@@ -872,7 +872,7 @@ Audio2_21daa: ; 21daa (8:5daa)
 	ld [hl], d
 	ret
 
-Audio2_21dcc: ; 21dcc (8:5dcc)
+Audio2_21dcc:
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -927,7 +927,7 @@ Audio2_21dcc: ; 21dcc (8:5dcc)
 .musicChannel
 	ret
 
-Audio2_21e19: ; 21e19 (8:5e19)
+Audio2_21e19:
 	ld a, c
 	cp CH4
 	jr nz, .asm_21e2e
@@ -941,7 +941,7 @@ Audio2_21e19: ; 21e19 (8:5e19)
 .asm_21e2e
 	ret
 
-Audio2_21e2f: ; 21e2f (8:5e2f)
+Audio2_21e2f:
 	call Audio2_21e8b
 	jr c, .asm_21e39
 	call Audio2_21e9f
@@ -965,7 +965,7 @@ Audio2_21e2f: ; 21e2f (8:5e2f)
 .asm_21e55
 	ret
 
-Audio2_21e56: ; 21e56 (8:5e56)
+Audio2_21e56:
 	call Audio2_21e8b
 	jr c, .asm_21e60
 	call Audio2_21e9f
@@ -984,7 +984,7 @@ Audio2_21e56: ; 21e56 (8:5e56)
 .asm_21e6c
 	ret
 
-Audio2_21e6d: ; 21e6d (8:5e6d)
+Audio2_21e6d:
 	call Audio2_21e8b
 	jr nc, .asm_21e88
 	ld hl, wChannelCommandPointers
@@ -1007,7 +1007,7 @@ Audio2_21e6d: ; 21e6d (8:5e6d)
 	ccf
 	ret
 
-Audio2_21e8b: ; 21e8b (8:5e8b)
+Audio2_21e8b:
 	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_21e94
@@ -1024,7 +1024,7 @@ Audio2_21e8b: ; 21e8b (8:5e8b)
 	scf
 	ret
 
-Audio2_21e9f: ; 21e9f (8:5e9f)
+Audio2_21e9f:
 	ld a, [wChannelSoundIDs + CH7]
 	ld b, a
 	ld a, [wChannelSoundIDs + CH4]
@@ -1044,7 +1044,7 @@ Audio2_21e9f: ; 21e9f (8:5e9f)
 	scf
 	ret
 
-Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8)
+Audio2_ApplyPitchBend:
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
@@ -1146,7 +1146,7 @@ Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	res 5, [hl]
 	ret
 
-Audio2_21f4e: ; 21f4e (8:5f4e)
+Audio2_21f4e:
 	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
@@ -1235,7 +1235,7 @@ Audio2_21f4e: ; 21f4e (8:5f4e)
 	ld [hl], a
 	ret
 
-Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc)
+Audio2_ApplyDutyCycle:
 	ld b, $0
 	ld hl, wChannelDutyCycles
 	add hl, bc
@@ -1253,7 +1253,7 @@ Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc)
 	ld [hl], a
 	ret
 
-Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4)
+Audio2_GetNextMusicByte:
 	ld d, $0
 	ld a, c
 	add a
@@ -1271,7 +1271,7 @@ Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4)
 	ld [hl], d
 	ret
 
-Audio2_21ff7: ; 21ff7 (8:5ff7)
+Audio2_21ff7:
 	ld a, c
 	ld hl, Unknown_222d6
 	add l
@@ -1285,7 +1285,7 @@ Audio2_21ff7: ; 21ff7 (8:5ff7)
 	ld h, $ff
 	ret
 
-Audio2_22006: ; 22006 (8:6006)
+Audio2_22006:
 	ld h, $0
 .loop
 	srl a
@@ -1300,7 +1300,7 @@ Audio2_22006: ; 22006 (8:6006)
 .done
 	ret
 
-Audio2_22017: ; 22017 (8:6017)
+Audio2_22017:
 	ld h, $0
 	ld l, a
 	add hl, hl
@@ -1325,7 +1325,7 @@ Audio2_22017: ; 22017 (8:6017)
 	ld d, a
 	ret
 
-Audio2_PlaySound:: ; 22035 (8:6035)
+Audio2_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, Audio2_221f3
@@ -1408,7 +1408,7 @@ Audio2_PlaySound:: ; 22035 (8:6035)
 	ld [rNR50], a
 	jp Audio2_2224e
 
-Audio2_2210d: ; 2210d (8:610d)
+Audio2_2210d:
 	ld l, a
 	ld e, a
 	ld h, $0
@@ -1559,7 +1559,7 @@ Audio2_2210d: ; 2210d (8:610d)
 	dec c
 	jp .asm_22126
 
-Audio2_221f3: ; 221f3 (8:61f3)
+Audio2_221f3:
 	ld a, $80
 	ld [rNR52], a
 	ld [rNR30], a
@@ -1599,7 +1599,7 @@ Audio2_221f3: ; 221f3 (8:61f3)
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM2: ; 22248 (8:6248)
+FillAudioRAM2:
 	ld b, d
 .loop
 	ld [hli], a
@@ -1607,7 +1607,7 @@ FillAudioRAM2: ; 22248 (8:6248)
 	jr nz, .loop
 	ret
 
-Audio2_2224e: ; 2224e (8:624e)
+Audio2_2224e:
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
@@ -1702,22 +1702,22 @@ Audio2_2224e: ; 2224e (8:624e)
 .asm_222d4
 	ret
 
-Noise2_endchannel: ; 222d5 (8:62d5)
+Noise2_endchannel:
 	endchannel
 
-Unknown_222d6: ; 222d6 (8:62d6)
+Unknown_222d6:
 	db $10, $15, $1A, $1F ; channels 0-3
 	db $10, $15, $1A, $1F ; channels 4-7
 
-Unknown_222de: ; 222de (8:62de)
+Unknown_222de:
 	db $EE, $DD, $BB, $77 ; channels 0-3
 	db $EE, $DD, $BB, $77 ; channels 4-7
 
-Unknown_222e6: ; 222e6 (8:62e6)
+Unknown_222e6:
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Audio2_Pitches: ; 222ee (8:62ee)
+Audio2_Pitches:
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_

audio/engine_3.asm

@@ -1,6 +1,6 @@
 ; The third of three duplicated sound engines.
 
-Audio3_UpdateMusic:: ; 7d177 (1f:5177)
+Audio3_UpdateMusic::
 	ld c, CH0
 .loop
 	ld b, $0
@@ -42,7 +42,7 @@ Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
+Audio3_ApplyMusicAffects:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters ; delay until next note
 	add hl, bc
@@ -148,7 +148,7 @@ Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Audio3_PlayNextNote: ; 7d244 (1f:5244)
+Audio3_PlayNextNote:
 	ld hl, wChannelVibratoDelayCounterReloadValues
 	add hl, bc
 	ld a, [hl]
@@ -162,7 +162,7 @@ Audio3_PlayNextNote: ; 7d244 (1f:5244)
 	call Audio3_endchannel
 	ret
 
-Audio3_endchannel: ; 7d25a (1f:525a)
+Audio3_endchannel:
 	call Audio3_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
@@ -251,7 +251,7 @@ Audio3_endchannel: ; 7d25a (1f:525a)
 	ld [hl], b
 	ret
 
-Audio3_callchannel: ; 7d2e8 (1f:52e8)
+Audio3_callchannel:
 	cp $fd ; is this command a callchannel?
 	jp nz, Audio3_loopchannel ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -288,7 +288,7 @@ Audio3_callchannel: ; 7d2e8 (1f:52e8)
 	set 1, [hl] ; set the call flag
 	jp Audio3_endchannel
 
-Audio3_loopchannel: ; 7d31d (1f:531d)
+Audio3_loopchannel:
 	cp $fe ; is this command a loopchannel?
 	jp nz, Audio3_notetype ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -326,7 +326,7 @@ Audio3_loopchannel: ; 7d31d (1f:531d)
 	ld [hl], b
 	jp Audio3_endchannel
 
-Audio3_notetype: ; 7d358 (1f:5358)
+Audio3_notetype:
 	and $f0
 	cp $d0 ; is this command a notetype?
 	jp nz, Audio3_toggleperfectpitch ; no
@@ -370,7 +370,7 @@ Audio3_notetype: ; 7d358 (1f:5358)
 .noiseChannel
 	jp Audio3_endchannel
 
-Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
+Audio3_toggleperfectpitch:
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
 	jr nz, Audio3_vibrato ; no
@@ -382,7 +382,7 @@ Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
 	ld [hl], a ; flip bit 0 of wChannelFlags1
 	jp Audio3_endchannel
 
-Audio3_vibrato: ; 7d3a9 (1f:53a9)
+Audio3_vibrato:
 	cp $ea ; is this command a vibrato?
 	jr nz, Audio3_pitchbend ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -416,7 +416,7 @@ Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	ld [hl], a ; store depth as both high and low nibbles
 	jp Audio3_endchannel
 
-Audio3_pitchbend: ; 7d3e1 (1f:53e1)
+Audio3_pitchbend:
 	cp $eb ; is this command a pitchbend?
 	jr nz, Audio3_duty ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -447,7 +447,7 @@ Audio3_pitchbend: ; 7d3e1 (1f:53e1)
 	ld d, a
 	jp Audio3_notelength
 
-Audio3_duty: ; 7d419 (1f:5419)
+Audio3_duty:
 	cp $ec ; is this command a duty?
 	jr nz, Audio3_tempo ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -460,7 +460,7 @@ Audio3_duty: ; 7d419 (1f:5419)
 	ld [hl], a ; store duty
 	jp Audio3_endchannel
 
-Audio3_tempo: ; 7d42e (1f:542e)
+Audio3_tempo:
 	cp $ed ; is this command a tempo?
 	jr nz, Audio3_stereopanning ; no
 	ld a, c ; yes
@@ -489,7 +489,7 @@ Audio3_tempo: ; 7d42e (1f:542e)
 .musicChannelDone
 	jp Audio3_endchannel
 
-Audio3_stereopanning: ; 7d46e (1f:546e)
+Audio3_stereopanning:
 	cp $ee ; is this command a stereopanning?
 	jr nz, Audio3_unknownmusic0xef ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -497,7 +497,7 @@ Audio3_stereopanning: ; 7d46e (1f:546e)
 	jp Audio3_endchannel
 
 ; this appears to never be used
-Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
+Audio3_unknownmusic0xef:
 	cp $ef ; is this command an unknownmusic0xef?
 	jr nz, Audio3_dutycycle ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -514,7 +514,7 @@ Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
 .skip
 	jp Audio3_endchannel
 
-Audio3_dutycycle: ; 7d49a (1f:549a)
+Audio3_dutycycle:
 	cp $fc ; is this command a dutycycle?
 	jr nz, Audio3_volume ; no
 	call Audio3_GetNextMusicByte ; yes
@@ -531,14 +531,14 @@ Audio3_dutycycle: ; 7d49a (1f:549a)
 	set 6, [hl] ; set duty flag
 	jp Audio3_endchannel
 
-Audio3_volume: ; 7d4b8 (1f:54b8)
+Audio3_volume:
 	cp $f0 ; is this command a volume?
 	jr nz, Audio3_executemusic ; no
 	call Audio3_GetNextMusicByte ; yes
 	ld [rNR50], a ; store volume
 	jp Audio3_endchannel
 
-Audio3_executemusic: ; 7d4c4 (1f:54c4)
+Audio3_executemusic:
 	cp $f8 ; is this command an executemusic?
 	jr nz, Audio3_octave ; no
 	ld b, $0 ; yes
@@ -547,7 +547,7 @@ Audio3_executemusic: ; 7d4c4 (1f:54c4)
 	set 0, [hl]
 	jp Audio3_endchannel
 
-Audio3_octave: ; 7d4d3 (1f:54d3)
+Audio3_octave:
 	and $f0
 	cp $e0 ; is this command an octave?
 	jr nz, Audio3_unknownsfx0x20 ; no
@@ -559,7 +559,7 @@ Audio3_octave: ; 7d4d3 (1f:54d3)
 	ld [hl], a ; store low nibble as octave
 	jp Audio3_endchannel
 
-Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
+Audio3_unknownsfx0x20:
 	cp $20 ; is this command an unknownsfx0x20?
 	jr nz, Audio3_unknownsfx0x10 ; no
 	ld a, c
@@ -604,7 +604,7 @@ Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
 	call Audio3_7d6bf
 	ret
 
-Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
+Audio3_unknownsfx0x10:
 	ld a, c
 	cp CH4
 	jr c, Audio3_note ; if not a sfx
@@ -620,7 +620,7 @@ Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
 	ld [rNR10], a
 	jp Audio3_endchannel
 
-Audio3_note: ; 7d54f (1f:554f)
+Audio3_note:
 	ld a, c
 	cp CH3
 	jr nz, Audio3_notelength ; if not noise channel
@@ -639,7 +639,7 @@ Audio3_note: ; 7d54f (1f:554f)
 	push bc
 	jr asm_7d571
 
-Audio3_dnote: ; 7d569 (1f:5569)
+Audio3_dnote:
 	ld a, d
 	and $f
 	push af
@@ -656,7 +656,7 @@ asm_7d571
 	pop bc
 	pop de
 
-Audio3_notelength: ; 7d57e (1f:557e)
+Audio3_notelength:
 	ld a, d
 	push af
 	and $f
@@ -714,7 +714,7 @@ Audio3_notelength: ; 7d57e (1f:557e)
 	pop hl
 	ret
 
-Audio3_notepitch: ; 7d5dc (1f:55dc)
+Audio3_notepitch:
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -807,7 +807,7 @@ Audio3_notepitch: ; 7d5dc (1f:55dc)
 	call Audio3_7d6bf
 	ret
 
-Audio3_7d66c: ; 7d66c (1f:566c)
+Audio3_7d66c:
 	ld b, $0
 	ld hl, Unknown_7db9b
 	add hl, bc
@@ -841,7 +841,7 @@ Audio3_7d66c: ; 7d66c (1f:566c)
 	ld [rNR51], a
 	ret
 
-Audio3_7d69d: ; 7d69d (1f:569d)
+Audio3_7d69d:
 	ld b, $0
 	ld hl, wChannelNoteDelayCounters
 	add hl, bc
@@ -865,7 +865,7 @@ Audio3_7d69d: ; 7d69d (1f:569d)
 	ld [hl], d
 	ret
 
-Audio3_7d6bf: ; 7d6bf (1f:56bf)
+Audio3_7d6bf:
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -916,7 +916,7 @@ Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	call Audio3_7d729
 	ret
 
-Audio3_7d707: ; 7d707 (1f:5707)
+Audio3_7d707:
 	call Audio3_7d759
 	jr nc, .asm_7d71f
 	ld d, $0
@@ -937,7 +937,7 @@ Audio3_7d707: ; 7d707 (1f:5707)
 .asm_7d728
 	ret
 
-Audio3_7d729: ; 7d729 (1f:5729)
+Audio3_7d729:
 	call Audio3_7d759
 	jr nc, .asm_7d73a
 	ld a, [wFrequencyModifier]
@@ -953,7 +953,7 @@ Audio3_7d729: ; 7d729 (1f:5729)
 .asm_7d73a
 	ret
 
-Audio3_7d73b: ; 7d73b (1f:573b)
+Audio3_7d73b:
 	call Audio3_7d759
 	jr nc, .asm_7d756
 	ld hl, wChannelCommandPointers
@@ -976,7 +976,7 @@ Audio3_7d73b: ; 7d73b (1f:573b)
 	ccf
 	ret
 
-Audio3_7d759: ; 7d759 (1f:5759)
+Audio3_7d759:
 	ld a, [wChannelSoundIDs + CH4]
 	cp $14
 	jr nc, .asm_7d762
@@ -993,7 +993,7 @@ Audio3_7d759: ; 7d759 (1f:5759)
 	scf
 	ret
 
-Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
+Audio3_ApplyPitchBend:
 	ld hl, wChannelFlags1
 	add hl, bc
 	bit 5, [hl]
@@ -1095,7 +1095,7 @@ Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	res 5, [hl]
 	ret
 
-Audio3_7d803: ; 7d803 (1f:5803)
+Audio3_7d803:
 	ld hl, wChannelPitchBendCurrentFrequencyHighBytes
 	add hl, bc
 	ld [hl], d
@@ -1184,7 +1184,7 @@ Audio3_7d803: ; 7d803 (1f:5803)
 	ld [hl], a
 	ret
 
-Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
+Audio3_ApplyDutyCycle:
 	ld b, $0
 	ld hl, wChannelDutyCycles
 	add hl, bc
@@ -1202,7 +1202,7 @@ Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
 	ld [hl], a
 	ret
 
-Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
+Audio3_GetNextMusicByte:
 	ld d, $0
 	ld a, c
 	add a
@@ -1220,7 +1220,7 @@ Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld [hl], d
 	ret
 
-Audio3_7d8ac: ; 7d8ac (1f:58ac)
+Audio3_7d8ac:
 	ld a, c
 	ld hl, Unknown_7db8b
 	add l
@@ -1234,7 +1234,7 @@ Audio3_7d8ac: ; 7d8ac (1f:58ac)
 	ld h, $ff
 	ret
 
-Audio3_7d8bb: ; 7d8bb (1f:58bb)
+Audio3_7d8bb:
 	ld h, $0
 .loop
 	srl a
@@ -1249,7 +1249,7 @@ Audio3_7d8bb: ; 7d8bb (1f:58bb)
 .done
 	ret
 
-Audio3_7d8cc: ; 7d8cc (1f:58cc)
+Audio3_7d8cc:
 	ld h, $0
 	ld l, a
 	add hl, hl
@@ -1274,7 +1274,7 @@ Audio3_7d8cc: ; 7d8cc (1f:58cc)
 	ld d, a
 	ret
 
-Audio3_PlaySound:: ; 7d8ea (1f:58ea)
+Audio3_PlaySound::
 	ld [wSoundID], a
 	cp $ff
 	jp z, Audio3_7daa8
@@ -1357,7 +1357,7 @@ Audio3_PlaySound:: ; 7d8ea (1f:58ea)
 	ld [rNR50], a
 	jp Audio3_7db03
 
-Audio3_7d9c2: ; 7d9c2 (1f:59c2)
+Audio3_7d9c2:
 	ld l, a
 	ld e, a
 	ld h, $0
@@ -1508,7 +1508,7 @@ Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	dec c
 	jp .asm_7d9db
 
-Audio3_7daa8: ; 7daa8 (1f:5aa8)
+Audio3_7daa8:
 	ld a, $80
 	ld [rNR52], a
 	ld [rNR30], a
@@ -1548,7 +1548,7 @@ Audio3_7daa8: ; 7daa8 (1f:5aa8)
 	ret
 
 ; fills d bytes at hl with a
-FillAudioRAM3: ; 7dafd (1f:5afd)
+FillAudioRAM3:
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,7 +1556,7 @@ FillAudioRAM3: ; 7dafd (1f:5afd)
 	jr nz, .loop
 	ret
 
-Audio3_7db03: ; 7db03 (1f:5b03)
+Audio3_7db03:
 	ld a, [wSoundID]
 	ld l, a
 	ld e, a
@@ -1651,22 +1651,22 @@ Audio3_7db03: ; 7db03 (1f:5b03)
 .asm_7db89
 	ret
 
-Noise3_endchannel: ; 7db8a (1f:5b8a)
+Noise3_endchannel:
 	endchannel
 
-Unknown_7db8b: ; 7db8b (1f:5b8b)
+Unknown_7db8b:
 	db $10, $15, $1A, $1F ; channels 0-3
 	db $10, $15, $1A, $1F ; channels 4-7
 
-Unknown_7db93: ; 7db93 (1f:5b93)
+Unknown_7db93:
 	db $EE, $DD, $BB, $77 ; channels 0-3
 	db $EE, $DD, $BB, $77 ; channels 4-7
 
-Unknown_7db9b: ; 7db9b (1f:5b9b)
+Unknown_7db9b:
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Audio3_Pitches: ; 7dba3 (1f:5ba3)
+Audio3_Pitches:
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_

audio/headers/musicheaders1.asm

@@ -1,4 +1,4 @@
-Music_PalletTown:: ; 822e (2:422e)
+Music_PalletTown::
 	db ( $80 | CH0 )
 	dw Music_PalletTown_Ch1
 	db CH1
@@ -6,7 +6,7 @@ Music_PalletTown:: ; 822e (2:422e)
 	db CH2
 	dw Music_PalletTown_Ch3
 
-Music_Pokecenter:: ; 8237 (2:4237)
+Music_Pokecenter::
 	db ( $80 | CH0 )
 	dw Music_Pokecenter_Ch1
 	db CH1
@@ -14,7 +14,7 @@ Music_Pokecenter:: ; 8237 (2:4237)
 	db CH2
 	dw Music_Pokecenter_Ch3
 
-Music_Gym:: ; 8240 (2:4240)
+Music_Gym::
 	db ( $80 | CH0 )
 	dw Music_Gym_Ch1
 	db CH1
@@ -23,7 +23,7 @@ Music_Gym:: ; 8240 (2:4240)
 	dw Music_Gym_Ch3
 
 ; Viridian City, Pewter City, Saffron City
-Music_Cities1:: ; 8249 (2:4249)
+Music_Cities1::
 	db ( $C0 | CH0 )
 	dw Music_Cities1_Ch1
 	db CH1
@@ -34,7 +34,7 @@ Music_Cities1:: ; 8249 (2:4249)
 	dw Music_Cities1_Ch4
 
 ; Cerulean City, Fuchsia City
-Music_Cities2:: ; 8255 (2:4255)
+Music_Cities2::
 	db ( $80 | CH0 )
 	dw Music_Cities2_Ch1
 	db CH1
@@ -42,7 +42,7 @@ Music_Cities2:: ; 8255 (2:4255)
 	db CH2
 	dw Music_Cities2_Ch3
 
-Music_Celadon:: ; 825e (2:425e)
+Music_Celadon::
 	db ( $80 | CH0 )
 	dw Music_Celadon_Ch1
 	db CH1
@@ -50,7 +50,7 @@ Music_Celadon:: ; 825e (2:425e)
 	db CH2
 	dw Music_Celadon_Ch3
 
-Music_Cinnabar:: ; 8267 (2:4267)
+Music_Cinnabar::
 	db ( $80 | CH0 )
 	dw Music_Cinnabar_Ch1
 	db CH1
@@ -58,7 +58,7 @@ Music_Cinnabar:: ; 8267 (2:4267)
 	db CH2
 	dw Music_Cinnabar_Ch3
 
-Music_Vermilion:: ; 8270 (2:4270)
+Music_Vermilion::
 	db ( $C0 | CH0 )
 	dw Music_Vermilion_Ch1
 	db CH1
@@ -68,7 +68,7 @@ Music_Vermilion:: ; 8270 (2:4270)
 	db CH3
 	dw Music_Vermilion_Ch4
 
-Music_Lavender:: ; 827c (2:427c)
+Music_Lavender::
 	db ( $C0 | CH0 )
 	dw Music_Lavender_Ch1
 	db CH1
@@ -78,7 +78,7 @@ Music_Lavender:: ; 827c (2:427c)
 	db CH3
 	dw Music_Lavender_Ch4
 
-Music_SSAnne:: ; 8288 (2:4288)
+Music_SSAnne::
 	db ( $80 | CH0 )
 	dw Music_SSAnne_Ch1
 	db CH1
@@ -86,7 +86,7 @@ Music_SSAnne:: ; 8288 (2:4288)
 	db CH2
 	dw Music_SSAnne_Ch3
 
-Music_MeetProfOak:: ; 8291 (2:4291)
+Music_MeetProfOak::
 	db ( $80 | CH0 )
 	dw Music_MeetProfOak_Ch1
 	db CH1
@@ -94,7 +94,7 @@ Music_MeetProfOak:: ; 8291 (2:4291)
 	db CH2
 	dw Music_MeetProfOak_Ch3
 
-Music_MeetRival:: ; 829a (2:429a)
+Music_MeetRival::
 	db ( $80 | CH0 )
 	dw Music_MeetRival_Ch1
 	db CH1
@@ -102,7 +102,7 @@ Music_MeetRival:: ; 829a (2:429a)
 	db CH2
 	dw Music_MeetRival_Ch3
 
-Music_MuseumGuy:: ; 82a3 (2:42a3)
+Music_MuseumGuy::
 	db ( $C0 | CH0 )
 	dw Music_MuseumGuy_Ch1
 	db CH1
@@ -112,7 +112,7 @@ Music_MuseumGuy:: ; 82a3 (2:42a3)
 	db CH3
 	dw Music_MuseumGuy_Ch4
 
-Music_SafariZone:: ; 82af (2:42af)
+Music_SafariZone::
 	db ( $80 | CH0 )
 	dw Music_SafariZone_Ch1
 	db CH1
@@ -120,7 +120,7 @@ Music_SafariZone:: ; 82af (2:42af)
 	db CH2
 	dw Music_SafariZone_Ch3
 
-Music_PkmnHealed:: ; 82b8 (2:42b8)
+Music_PkmnHealed::
 	db ( $80 | CH0 )
 	dw Music_PkmnHealed_Ch1
 	db CH1
@@ -129,7 +129,7 @@ Music_PkmnHealed:: ; 82b8 (2:42b8)
 	dw Music_PkmnHealed_Ch3
 
 ; Routes 1 and 2
-Music_Routes1:: ; 82c1 (2:42c1)
+Music_Routes1::
 	db ( $C0 | CH0 )
 	dw Music_Routes1_Ch1
 	db CH1
@@ -140,7 +140,7 @@ Music_Routes1:: ; 82c1 (2:42c1)
 	dw Music_Routes1_Ch4
 
 ; Routes 24 and 25
-Music_Routes2:: ; 82cd (2:42cd)
+Music_Routes2::
 	db ( $C0 | CH0 )
 	dw Music_Routes2_Ch1
 	db CH1
@@ -151,7 +151,7 @@ Music_Routes2:: ; 82cd (2:42cd)
 	dw Music_Routes2_Ch4
 
 ; Routes 3, 4, 5, 6, 7, 8, 9, 10, 16, 17, 18, 19, 20, 21, 22
-Music_Routes3:: ; 82d9 (2:42d9)
+Music_Routes3::
 	db ( $C0 | CH0 )
 	dw Music_Routes3_Ch1
 	db CH1
@@ -162,7 +162,7 @@ Music_Routes3:: ; 82d9 (2:42d9)
 	dw Music_Routes3_Ch4
 
 ; Routes 11, 12, 13, 14, 15
-Music_Routes4:: ; 82d5 (2:42d5)
+Music_Routes4::
 	db ( $C0 | CH0 )
 	dw Music_Routes4_Ch1
 	db CH1
@@ -173,7 +173,7 @@ Music_Routes4:: ; 82d5 (2:42d5)
 	dw Music_Routes4_Ch4
 
 ; Route 23, Indigo Plateau
-Music_IndigoPlateau:: ; 82f1 (2:42f1)
+Music_IndigoPlateau::
 	db ( $C0 | CH0 )
 	dw Music_IndigoPlateau_Ch1
 	db CH1

audio/headers/musicheaders2.asm

@@ -1,4 +1,4 @@
-Music_GymLeaderBattle:: ; 202be (8:42be)
+Music_GymLeaderBattle::
 	db ( $80 | CH0 )
 	dw Music_GymLeaderBattle_Ch1
 	db CH1
@@ -6,7 +6,7 @@ Music_GymLeaderBattle:: ; 202be (8:42be)
 	db CH2
 	dw Music_GymLeaderBattle_Ch3
 
-Music_TrainerBattle:: ; 202c7 (8:42c7)
+Music_TrainerBattle::
 	db ( $80 | CH0 )
 	dw Music_TrainerBattle_Ch1
 	db CH1
@@ -14,7 +14,7 @@ Music_TrainerBattle:: ; 202c7 (8:42c7)
 	db CH2
 	dw Music_TrainerBattle_Ch3
 
-Music_WildBattle:: ; 202d0 (8:42d0)
+Music_WildBattle::
 	db ( $80 | CH0 )
 	dw Music_WildBattle_Ch1
 	db CH1
@@ -22,7 +22,7 @@ Music_WildBattle:: ; 202d0 (8:42d0)
 	db CH2
 	dw Music_WildBattle_Ch3
 
-Music_FinalBattle:: ; 202d9 (8:42d9)
+Music_FinalBattle::
 	db ( $80 | CH0 )
 	dw Music_FinalBattle_Ch1
 	db CH1
@@ -30,7 +30,7 @@ Music_FinalBattle:: ; 202d9 (8:42d9)
 	db CH2
 	dw Music_FinalBattle_Ch3
 
-Music_DefeatedTrainer:: ; 202e2 (8:42e2)
+Music_DefeatedTrainer::
 	db ( $80 | CH0 )
 	dw Music_DefeatedTrainer_Ch1
 	db CH1
@@ -38,7 +38,7 @@ Music_DefeatedTrainer:: ; 202e2 (8:42e2)
 	db CH2
 	dw Music_DefeatedTrainer_Ch3
 
-Music_DefeatedWildMon:: ; 202eb (8:42eb)
+Music_DefeatedWildMon::
 	db ( $80 | CH0 )
 	dw Music_DefeatedWildMon_Ch1
 	db CH1
@@ -46,7 +46,7 @@ Music_DefeatedWildMon:: ; 202eb (8:42eb)
 	db CH2
 	dw Music_DefeatedWildMon_Ch3
 
-Music_DefeatedGymLeader:: ; 202f4 (8:42f4)
+Music_DefeatedGymLeader::
 	db ( $80 | CH0 )
 	dw Music_DefeatedGymLeader_Ch1
 	db CH1

audio/headers/musicheaders3.asm

@@ -1,4 +1,4 @@
-Music_TitleScreen:: ; 7c249 (1f:4249)
+Music_TitleScreen::
 	db ( $C0 | CH0 )
 	dw Music_TitleScreen_Ch1
 	db CH1
@@ -8,7 +8,7 @@ Music_TitleScreen:: ; 7c249 (1f:4249)
 	db CH3
 	dw Music_TitleScreen_Ch4
 
-Music_Credits:: ; 7c255 (1f:4255)
+Music_Credits::
 	db ( $80 | CH0 )
 	dw Music_Credits_Ch1
 	db CH1
@@ -16,7 +16,7 @@ Music_Credits:: ; 7c255 (1f:4255)
 	db CH2
 	dw Music_Credits_Ch3
 
-Music_HallOfFame:: ; 7c25e (1f:425e)
+Music_HallOfFame::
 	db ( $80 | CH0 )
 	dw Music_HallOfFame_Ch1
 	db CH1
@@ -24,7 +24,7 @@ Music_HallOfFame:: ; 7c25e (1f:425e)
 	db CH2
 	dw Music_HallOfFame_Ch3
 
-Music_OaksLab:: ; 7c267 (1f:4267)
+Music_OaksLab::
 	db ( $80 | CH0 )
 	dw Music_OaksLab_Ch1
 	db CH1
@@ -32,13 +32,13 @@ Music_OaksLab:: ; 7c267 (1f:4267)
 	db CH2
 	dw Music_OaksLab_Ch3
 
-Music_JigglypuffSong:: ; 7c270 (1f:4270)
+Music_JigglypuffSong::
 	db $40
 	dw Music_JigglypuffSong_Ch1
 	db CH1
 	dw Music_JigglypuffSong_Ch2
 
-Music_BikeRiding:: ; 7c276 (1f:4276)
+Music_BikeRiding::
 	db ( $C0 | CH0 )
 	dw Music_BikeRiding_Ch1
 	db CH1
@@ -48,7 +48,7 @@ Music_BikeRiding:: ; 7c276 (1f:4276)
 	db CH3
 	dw Music_BikeRiding_Ch4
 
-Music_Surfing:: ; 7c282 (1f:4282)
+Music_Surfing::
 	db ( $80 | CH0 )
 	dw Music_Surfing_Ch1
 	db CH1
@@ -56,7 +56,7 @@ Music_Surfing:: ; 7c282 (1f:4282)
 	db CH2
 	dw Music_Surfing_Ch3
 
-Music_GameCorner:: ; 7c28b (1f:428b)
+Music_GameCorner::
 	db ( $80 | CH0 )
 	dw Music_GameCorner_Ch1
 	db CH1
@@ -64,7 +64,7 @@ Music_GameCorner:: ; 7c28b (1f:428b)
 	db CH2
 	dw Music_GameCorner_Ch3
 
-Music_IntroBattle:: ; 7c294 (1f:4294)
+Music_IntroBattle::
 	db ( $C0 | CH0 )
 	dw Music_IntroBattle_Ch1
 	db CH1
@@ -75,7 +75,7 @@ Music_IntroBattle:: ; 7c294 (1f:4294)
 	dw Music_IntroBattle_Ch4
 
 ; Power Plant, Unknown Dungeon, Rocket HQ
-Music_Dungeon1:: ; 7c2a0 (1f:42a0)
+Music_Dungeon1::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon1_Ch1
 	db CH1
@@ -86,7 +86,7 @@ Music_Dungeon1:: ; 7c2a0 (1f:42a0)
 	dw Music_Dungeon1_Ch4
 
 ; Viridian Forest, Seafoam Islands
-Music_Dungeon2:: ; 7c2ac (1f:42ac)
+Music_Dungeon2::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon2_Ch1
 	db CH1
@@ -97,7 +97,7 @@ Music_Dungeon2:: ; 7c2ac (1f:42ac)
 	dw Music_Dungeon2_Ch4
 
 ; Mt. Moon, Rock Tunnel, Victory Road
-Music_Dungeon3:: ; 7c2b8 (1f:42b8)
+Music_Dungeon3::
 	db ( $C0 | CH0 )
 	dw Music_Dungeon3_Ch1
 	db CH1
@@ -107,7 +107,7 @@ Music_Dungeon3:: ; 7c2b8 (1f:42b8)
 	db CH3
 	dw Music_Dungeon3_Ch4
 
-Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
+Music_CinnabarMansion::
 	db ( $C0 | CH0 )
 	dw Music_CinnabarMansion_Ch1
 	db CH1
@@ -117,7 +117,7 @@ Music_CinnabarMansion:: ; 7c2c4 (1f:42c4)
 	db CH3
 	dw Music_CinnabarMansion_Ch4
 
-Music_PokemonTower:: ; 7c2d0 (1f:42d0)
+Music_PokemonTower::
 	db ( $80 | CH0 )
 	dw Music_PokemonTower_Ch1
 	db CH1
@@ -125,7 +125,7 @@ Music_PokemonTower:: ; 7c2d0 (1f:42d0)
 	db CH2
 	dw Music_PokemonTower_Ch3
 
-Music_SilphCo:: ; 7c2d9 (1f:42d9)
+Music_SilphCo::
 	db ( $80 | CH0 )
 	dw Music_SilphCo_Ch1
 	db CH1
@@ -133,7 +133,7 @@ Music_SilphCo:: ; 7c2d9 (1f:42d9)
 	db CH2
 	dw Music_SilphCo_Ch3
 
-Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
+Music_MeetEvilTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetEvilTrainer_Ch1
 	db CH1
@@ -141,7 +141,7 @@ Music_MeetEvilTrainer:: ; 7c2e2 (1f:42e2)
 	db CH2
 	dw Music_MeetEvilTrainer_Ch3
 
-Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
+Music_MeetFemaleTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetFemaleTrainer_Ch1
 	db CH1
@@ -149,7 +149,7 @@ Music_MeetFemaleTrainer:: ; 7c2eb (1f:42eb)
 	db CH2
 	dw Music_MeetFemaleTrainer_Ch3
 
-Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
+Music_MeetMaleTrainer::
 	db ( $80 | CH0 )
 	dw Music_MeetMaleTrainer_Ch1
 	db CH1

audio/headers/sfxheaders1.asm

@@ -1,83 +1,83 @@
 SFX_Headers_1::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_1:: ; 8003 (2:4003)
+SFX_Snare1_1::
 	db CH7
 	dw SFX_Snare1_1_Ch1
 
-SFX_Snare2_1:: ; 8006 (2:4006)
+SFX_Snare2_1::
 	db CH7
 	dw SFX_Snare2_1_Ch1
 
-SFX_Snare3_1:: ; 8009 (2:4009)
+SFX_Snare3_1::
 	db CH7
 	dw SFX_Snare3_1_Ch1
 
-SFX_Snare4_1:: ; 800c (2:400c)
+SFX_Snare4_1::
 	db CH7
 	dw SFX_Snare4_1_Ch1
 
-SFX_Snare5_1:: ; 800f (2:400f)
+SFX_Snare5_1::
 	db CH7
 	dw SFX_Snare5_1_Ch1
 
-SFX_Triangle1_1:: ; 8012 (2:4012)
+SFX_Triangle1_1::
 	db CH7
 	dw SFX_Triangle1_1_Ch1
 
-SFX_Triangle2_1:: ; 8015 (2:4015)
+SFX_Triangle2_1::
 	db CH7
 	dw SFX_Triangle2_1_Ch1
 
-SFX_Snare6_1:: ; 8018 (2:4018)
+SFX_Snare6_1::
 	db CH7
 	dw SFX_Snare6_1_Ch1
 
-SFX_Snare7_1:: ; 801b (2:401b)
+SFX_Snare7_1::
 	db CH7
 	dw SFX_Snare7_1_Ch1
 
-SFX_Snare8_1:: ; 801e (2:401e)
+SFX_Snare8_1::
 	db CH7
 	dw SFX_Snare8_1_Ch1
 
-SFX_Snare9_1:: ; 8021 (2:4021)
+SFX_Snare9_1::
 	db CH7
 	dw SFX_Snare9_1_Ch1
 
-SFX_Cymbal1_1:: ; 8024 (2:4024)
+SFX_Cymbal1_1::
 	db CH7
 	dw SFX_Cymbal1_1_Ch1
 
-SFX_Cymbal2_1:: ; 8027 (2:4027)
+SFX_Cymbal2_1::
 	db CH7
 	dw SFX_Cymbal2_1_Ch1
 
-SFX_Cymbal3_1:: ; 802a (2:402a)
+SFX_Cymbal3_1::
 	db CH7
 	dw SFX_Cymbal3_1_Ch1
 
-SFX_Muted_Snare1_1:: ; 802d (2:402d)
+SFX_Muted_Snare1_1::
 	db CH7
 	dw SFX_Muted_Snare1_1_Ch1
 
-SFX_Triangle3_1:: ; 8030 (2:4030)
+SFX_Triangle3_1::
 	db CH7
 	dw SFX_Triangle3_1_Ch1
 
-SFX_Muted_Snare2_1:: ; 8033 (2:4033)
+SFX_Muted_Snare2_1::
 	db CH7
 	dw SFX_Muted_Snare2_1_Ch1
 
-SFX_Muted_Snare3_1:: ; 8036 (2:4036)
+SFX_Muted_Snare3_1::
 	db CH7
 	dw SFX_Muted_Snare3_1_Ch1
 
-SFX_Muted_Snare4_1:: ; 8039 (2:4039)
+SFX_Muted_Snare4_1::
 	db CH7
 	dw SFX_Muted_Snare4_1_Ch1
 
-SFX_Cry00_1:: ; 803c (2:403c)
+SFX_Cry00_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_1_Ch1
 	db CH5
@@ -85,7 +85,7 @@ SFX_Cry00_1:: ; 803c (2:403c)
 	db CH7
 	dw SFX_Cry00_1_Ch3
 
-SFX_Cry01_1:: ; 8045 (2:4045)
+SFX_Cry01_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_1_Ch1
 	db CH5
@@ -93,7 +93,7 @@ SFX_Cry01_1:: ; 8045 (2:4045)
 	db CH7
 	dw SFX_Cry01_1_Ch3
 
-SFX_Cry02_1:: ; 804e (2:404e)
+SFX_Cry02_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_1_Ch1
 	db CH5
@@ -101,7 +101,7 @@ SFX_Cry02_1:: ; 804e (2:404e)
 	db CH7
 	dw SFX_Cry02_1_Ch3
 
-SFX_Cry03_1:: ; 8057 (2:4057)
+SFX_Cry03_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_1_Ch1
 	db CH5
@@ -109,7 +109,7 @@ SFX_Cry03_1:: ; 8057 (2:4057)
 	db CH7
 	dw SFX_Cry03_1_Ch3
 
-SFX_Cry04_1:: ; 8060 (2:4060)
+SFX_Cry04_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_1_Ch1
 	db CH5
@@ -117,7 +117,7 @@ SFX_Cry04_1:: ; 8060 (2:4060)
 	db CH7
 	dw SFX_Cry04_1_Ch3
 
-SFX_Cry05_1:: ; 8069 (2:4069)
+SFX_Cry05_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_1_Ch1
 	db CH5
@@ -125,7 +125,7 @@ SFX_Cry05_1:: ; 8069 (2:4069)
 	db CH7
 	dw SFX_Cry05_1_Ch3
 
-SFX_Cry06_1:: ; 8072 (2:4072)
+SFX_Cry06_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_1_Ch1
 	db CH5
@@ -133,7 +133,7 @@ SFX_Cry06_1:: ; 8072 (2:4072)
 	db CH7
 	dw SFX_Cry06_1_Ch3
 
-SFX_Cry07_1:: ; 807b (2:407b)
+SFX_Cry07_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_1_Ch1
 	db CH5
@@ -141,7 +141,7 @@ SFX_Cry07_1:: ; 807b (2:407b)
 	db CH7
 	dw SFX_Cry07_1_Ch3
 
-SFX_Cry08_1:: ; 8084 (2:4084)
+SFX_Cry08_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_1_Ch1
 	db CH5
@@ -149,7 +149,7 @@ SFX_Cry08_1:: ; 8084 (2:4084)
 	db CH7
 	dw SFX_Cry08_1_Ch3
 
-SFX_Cry09_1:: ; 808d (2:408d)
+SFX_Cry09_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_1_Ch1
 	db CH5
@@ -157,7 +157,7 @@ SFX_Cry09_1:: ; 808d (2:408d)
 	db CH7
 	dw SFX_Cry09_1_Ch3
 
-SFX_Cry0A_1:: ; 8096 (2:4096)
+SFX_Cry0A_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_1_Ch1
 	db CH5
@@ -165,7 +165,7 @@ SFX_Cry0A_1:: ; 8096 (2:4096)
 	db CH7
 	dw SFX_Cry0A_1_Ch3
 
-SFX_Cry0B_1:: ; 809f (2:409f)
+SFX_Cry0B_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_1_Ch1
 	db CH5
@@ -173,7 +173,7 @@ SFX_Cry0B_1:: ; 809f (2:409f)
 	db CH7
 	dw SFX_Cry0B_1_Ch3
 
-SFX_Cry0C_1:: ; 80a8 (2:40a8)
+SFX_Cry0C_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_1_Ch1
 	db CH5
@@ -181,7 +181,7 @@ SFX_Cry0C_1:: ; 80a8 (2:40a8)
 	db CH7
 	dw SFX_Cry0C_1_Ch3
 
-SFX_Cry0D_1:: ; 80b1 (2:40b1)
+SFX_Cry0D_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_1_Ch1
 	db CH5
@@ -189,7 +189,7 @@ SFX_Cry0D_1:: ; 80b1 (2:40b1)
 	db CH7
 	dw SFX_Cry0D_1_Ch3
 
-SFX_Cry0E_1:: ; 80ba (2:40ba)
+SFX_Cry0E_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_1_Ch1
 	db CH5
@@ -197,7 +197,7 @@ SFX_Cry0E_1:: ; 80ba (2:40ba)
 	db CH7
 	dw SFX_Cry0E_1_Ch3
 
-SFX_Cry0F_1:: ; 80c3 (2:40c3)
+SFX_Cry0F_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_1_Ch1
 	db CH5
@@ -205,7 +205,7 @@ SFX_Cry0F_1:: ; 80c3 (2:40c3)
 	db CH7
 	dw SFX_Cry0F_1_Ch3
 
-SFX_Cry10_1:: ; 80cc (2:40cc)
+SFX_Cry10_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_1_Ch1
 	db CH5
@@ -213,7 +213,7 @@ SFX_Cry10_1:: ; 80cc (2:40cc)
 	db CH7
 	dw SFX_Cry10_1_Ch3
 
-SFX_Cry11_1:: ; 80d5 (2:40d5)
+SFX_Cry11_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_1_Ch1
 	db CH5
@@ -221,7 +221,7 @@ SFX_Cry11_1:: ; 80d5 (2:40d5)
 	db CH7
 	dw SFX_Cry11_1_Ch3
 
-SFX_Cry12_1:: ; 80de (2:40de)
+SFX_Cry12_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_1_Ch1
 	db CH5
@@ -229,7 +229,7 @@ SFX_Cry12_1:: ; 80de (2:40de)
 	db CH7
 	dw SFX_Cry12_1_Ch3
 
-SFX_Cry13_1:: ; 80e7 (2:40e7)
+SFX_Cry13_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_1_Ch1
 	db CH5
@@ -237,7 +237,7 @@ SFX_Cry13_1:: ; 80e7 (2:40e7)
 	db CH7
 	dw SFX_Cry13_1_Ch3
 
-SFX_Cry14_1:: ; 80f0 (2:40f0)
+SFX_Cry14_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_1_Ch1
 	db CH5
@@ -245,7 +245,7 @@ SFX_Cry14_1:: ; 80f0 (2:40f0)
 	db CH7
 	dw SFX_Cry14_1_Ch3
 
-SFX_Cry15_1:: ; 80f9 (2:40f9)
+SFX_Cry15_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_1_Ch1
 	db CH5
@@ -253,7 +253,7 @@ SFX_Cry15_1:: ; 80f9 (2:40f9)
 	db CH7
 	dw SFX_Cry15_1_Ch3
 
-SFX_Cry16_1:: ; 8102 (2:4102)
+SFX_Cry16_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_1_Ch1
 	db CH5
@@ -261,7 +261,7 @@ SFX_Cry16_1:: ; 8102 (2:4102)
 	db CH7
 	dw SFX_Cry16_1_Ch3
 
-SFX_Cry17_1:: ; 810b (2:410b)
+SFX_Cry17_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_1_Ch1
 	db CH5
@@ -269,7 +269,7 @@ SFX_Cry17_1:: ; 810b (2:410b)
 	db CH7
 	dw SFX_Cry17_1_Ch3
 
-SFX_Cry18_1:: ; 8114 (2:4114)
+SFX_Cry18_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_1_Ch1
 	db CH5
@@ -277,7 +277,7 @@ SFX_Cry18_1:: ; 8114 (2:4114)
 	db CH7
 	dw SFX_Cry18_1_Ch3
 
-SFX_Cry19_1:: ; 811d (2:411d)
+SFX_Cry19_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_1_Ch1
 	db CH5
@@ -285,7 +285,7 @@ SFX_Cry19_1:: ; 811d (2:411d)
 	db CH7
 	dw SFX_Cry19_1_Ch3
 
-SFX_Cry1A_1:: ; 8126 (2:4126)
+SFX_Cry1A_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_1_Ch1
 	db CH5
@@ -293,7 +293,7 @@ SFX_Cry1A_1:: ; 8126 (2:4126)
 	db CH7
 	dw SFX_Cry1A_1_Ch3
 
-SFX_Cry1B_1:: ; 812f (2:412f)
+SFX_Cry1B_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_1_Ch1
 	db CH5
@@ -301,7 +301,7 @@ SFX_Cry1B_1:: ; 812f (2:412f)
 	db CH7
 	dw SFX_Cry1B_1_Ch3
 
-SFX_Cry1C_1:: ; 8138 (2:4138)
+SFX_Cry1C_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_1_Ch1
 	db CH5
@@ -309,7 +309,7 @@ SFX_Cry1C_1:: ; 8138 (2:4138)
 	db CH7
 	dw SFX_Cry1C_1_Ch3
 
-SFX_Cry1D_1:: ; 8141 (2:4141)
+SFX_Cry1D_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_1_Ch1
 	db CH5
@@ -317,7 +317,7 @@ SFX_Cry1D_1:: ; 8141 (2:4141)
 	db CH7
 	dw SFX_Cry1D_1_Ch3
 
-SFX_Cry1E_1:: ; 814a (2:414a)
+SFX_Cry1E_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_1_Ch1
 	db CH5
@@ -325,7 +325,7 @@ SFX_Cry1E_1:: ; 814a (2:414a)
 	db CH7
 	dw SFX_Cry1E_1_Ch3
 
-SFX_Cry1F_1:: ; 8153 (2:4153)
+SFX_Cry1F_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_1_Ch1
 	db CH5
@@ -333,7 +333,7 @@ SFX_Cry1F_1:: ; 8153 (2:4153)
 	db CH7
 	dw SFX_Cry1F_1_Ch3
 
-SFX_Cry20_1:: ; 815c (2:415c)
+SFX_Cry20_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_1_Ch1
 	db CH5
@@ -341,7 +341,7 @@ SFX_Cry20_1:: ; 815c (2:415c)
 	db CH7
 	dw SFX_Cry20_1_Ch3
 
-SFX_Cry21_1:: ; 8165 (2:4165)
+SFX_Cry21_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_1_Ch1
 	db CH5
@@ -349,7 +349,7 @@ SFX_Cry21_1:: ; 8165 (2:4165)
 	db CH7
 	dw SFX_Cry21_1_Ch3
 
-SFX_Cry22_1:: ; 816e (2:416e)
+SFX_Cry22_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_1_Ch1
 	db CH5
@@ -357,7 +357,7 @@ SFX_Cry22_1:: ; 816e (2:416e)
 	db CH7
 	dw SFX_Cry22_1_Ch3
 
-SFX_Cry23_1:: ; 8177 (2:4177)
+SFX_Cry23_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_1_Ch1
 	db CH5
@@ -365,7 +365,7 @@ SFX_Cry23_1:: ; 8177 (2:4177)
 	db CH7
 	dw SFX_Cry23_1_Ch3
 
-SFX_Cry24_1:: ; 8180 (2:4180)
+SFX_Cry24_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_1_Ch1
 	db CH5
@@ -373,7 +373,7 @@ SFX_Cry24_1:: ; 8180 (2:4180)
 	db CH7
 	dw SFX_Cry24_1_Ch3
 
-SFX_Cry25_1:: ; 8189 (2:4189)
+SFX_Cry25_1::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_1_Ch1
 	db CH5
@@ -381,7 +381,7 @@ SFX_Cry25_1:: ; 8189 (2:4189)
 	db CH7
 	dw SFX_Cry25_1_Ch3
 
-SFX_Get_Item1_1:: ; 8192 (2:4192)
+SFX_Get_Item1_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item1_1_Ch1
 	db CH5
@@ -389,7 +389,7 @@ SFX_Get_Item1_1:: ; 8192 (2:4192)
 	db CH6
 	dw SFX_Get_Item1_1_Ch3
 
-SFX_Get_Item2_1:: ; 819b (2:419b)
+SFX_Get_Item2_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_1_Ch1
 	db CH5
@@ -397,27 +397,27 @@ SFX_Get_Item2_1:: ; 819b (2:419b)
 	db CH6
 	dw SFX_Get_Item2_1_Ch3
 
-SFX_Tink_1:: ; 81a4 (2:41a4)
+SFX_Tink_1::
 	db CH4
 	dw SFX_Tink_1_Ch1
 
-SFX_Heal_HP_1:: ; 81a7 (2:41a7)
+SFX_Heal_HP_1::
 	db CH4
 	dw SFX_Heal_HP_1_Ch1
 
-SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
+SFX_Heal_Ailment_1::
 	db CH4
 	dw SFX_Heal_Ailment_1_Ch1
 
-SFX_Start_Menu_1:: ; 81ad (2:41ad)
+SFX_Start_Menu_1::
 	db CH7
 	dw SFX_Start_Menu_1_Ch1
 
-SFX_Press_AB_1:: ; 81b0 (2:41b0)
+SFX_Press_AB_1::
 	db CH4
 	dw SFX_Press_AB_1_Ch1
 
-SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
+SFX_Pokedex_Rating_1::
 	db ( $80 | CH4 )
 	dw SFX_Pokedex_Rating_1_Ch1
 	db CH5
@@ -425,7 +425,7 @@ SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
 	db CH6
 	dw SFX_Pokedex_Rating_1_Ch3
 
-SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
+SFX_Get_Key_Item_1::
 	db ( $80 | CH4 )
 	dw SFX_Get_Key_Item_1_Ch1
 	db CH5
@@ -433,130 +433,130 @@ SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
 	db CH6
 	dw SFX_Get_Key_Item_1_Ch3
 
-SFX_Poisoned_1:: ; 81c5 (2:41c5)
+SFX_Poisoned_1::
 	db CH4
 	dw SFX_Poisoned_1_Ch1
 
-SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
+SFX_Trade_Machine_1::
 	db CH4
 	dw SFX_Trade_Machine_1_Ch1
 
-SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
+SFX_Turn_On_PC_1::
 	db CH4
 	dw SFX_Turn_On_PC_1_Ch1
 
-SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
+SFX_Turn_Off_PC_1::
 	db CH4
 	dw SFX_Turn_Off_PC_1_Ch1
 
-SFX_Enter_PC_1:: ; 81d1 (2:41d1)
+SFX_Enter_PC_1::
 	db CH4
 	dw SFX_Enter_PC_1_Ch1
 
-SFX_Shrink_1:: ; 81d4 (2:41d4)
+SFX_Shrink_1::
 	db CH4
 	dw SFX_Shrink_1_Ch1
 
-SFX_Switch_1:: ; 81d7 (2:41d7)
+SFX_Switch_1::
 	db CH4
 	dw SFX_Switch_1_Ch1
 
-SFX_Healing_Machine_1:: ; 81da (2:41da)
+SFX_Healing_Machine_1::
 	db CH4
 	dw SFX_Healing_Machine_1_Ch1
 
-SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
+SFX_Teleport_Exit1_1::
 	db CH4
 	dw SFX_Teleport_Exit1_1_Ch1
 
-SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
+SFX_Teleport_Enter1_1::
 	db CH4
 	dw SFX_Teleport_Enter1_1_Ch1
 
-SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
+SFX_Teleport_Exit2_1::
 	db CH4
 	dw SFX_Teleport_Exit2_1_Ch1
 
-SFX_Ledge_1:: ; 81e6 (2:41e6)
+SFX_Ledge_1::
 	db CH4
 	dw SFX_Ledge_1_Ch1
 
-SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
+SFX_Teleport_Enter2_1::
 	db CH7
 	dw SFX_Teleport_Enter2_1_Ch1
 
-SFX_Fly_1:: ; 81ec (2:41ec)
+SFX_Fly_1::
 	db CH7
 	dw SFX_Fly_1_Ch1
 
-SFX_Denied_1:: ; 81ef (2:41ef)
+SFX_Denied_1::
 	db ( $40 | CH4 )
 	dw SFX_Denied_1_Ch1
 	db CH5
 	dw SFX_Denied_1_Ch2
 
-SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
+SFX_Arrow_Tiles_1::
 	db CH4
 	dw SFX_Arrow_Tiles_1_Ch1
 
-SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
+SFX_Push_Boulder_1::
 	db CH7
 	dw SFX_Push_Boulder_1_Ch1
 
-SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
+SFX_SS_Anne_Horn_1::
 	db ( $40 | CH4 )
 	dw SFX_SS_Anne_Horn_1_Ch1
 	db CH5
 	dw SFX_SS_Anne_Horn_1_Ch2
 
-SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
+SFX_Withdraw_Deposit_1::
 	db CH4
 	dw SFX_Withdraw_Deposit_1_Ch1
 
-SFX_Cut_1:: ; 8204 (2:4204)
+SFX_Cut_1::
 	db CH7
 	dw SFX_Cut_1_Ch1
 
-SFX_Go_Inside_1:: ; 8207 (2:4207)
+SFX_Go_Inside_1::
 	db CH7
 	dw SFX_Go_Inside_1_Ch1
 
-SFX_Swap_1:: ; 820a (2:420a)
+SFX_Swap_1::
 	db ( $40 | CH4 )
 	dw SFX_Swap_1_Ch1
 	db CH5
 	dw SFX_Swap_1_Ch2
 
-SFX_59_1:: ; 8210 (2:4210)
+SFX_59_1::
 	db ( $40 | CH4 )
 	dw SFX_59_1_Ch1
 	db CH5
 	dw SFX_59_1_Ch2
 
-SFX_Purchase_1:: ; 8216 (2:4216)
+SFX_Purchase_1::
 	db ( $40 | CH4 )
 	dw SFX_Purchase_1_Ch1
 	db CH5
 	dw SFX_Purchase_1_Ch2
 
-SFX_Collision_1:: ; 821c (2:421c)
+SFX_Collision_1::
 	db CH4
 	dw SFX_Collision_1_Ch1
 
-SFX_Go_Outside_1:: ; 821f (2:421f)
+SFX_Go_Outside_1::
 	db CH7
 	dw SFX_Go_Outside_1_Ch1
 
-SFX_Save_1:: ; 8222 (2:4222)
+SFX_Save_1::
 	db ( $40 | CH4 )
 	dw SFX_Save_1_Ch1
 	db CH5
 	dw SFX_Save_1_Ch2
 
-SFX_Pokeflute:: ; 8228 (2:4228)
+SFX_Pokeflute::
 	db CH2
 	dw SFX_Pokeflute_Ch1
 
-SFX_Safari_Zone_PA:: ; 822b (2:422b)
+SFX_Safari_Zone_PA::
 	db CH4
 	dw SFX_Safari_Zone_PA_Ch1

audio/headers/sfxheaders2.asm

@@ -1,83 +1,83 @@
 SFX_Headers_2::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_2:: ; 20003 (8:4003)
+SFX_Snare1_2::
 	db CH7
 	dw SFX_Snare1_2_Ch1
 
-SFX_Snare2_2:: ; 20006 (8:4006)
+SFX_Snare2_2::
 	db CH7
 	dw SFX_Snare2_2_Ch1
 
-SFX_Snare3_2:: ; 20009 (8:4009)
+SFX_Snare3_2::
 	db CH7
 	dw SFX_Snare3_2_Ch1
 
-SFX_Snare4_2:: ; 2000c (8:400c)
+SFX_Snare4_2::
 	db CH7
 	dw SFX_Snare4_2_Ch1
 
-SFX_Snare5_2:: ; 2000f (8:400f)
+SFX_Snare5_2::
 	db CH7
 	dw SFX_Snare5_2_Ch1
 
-SFX_Triangle1_2:: ; 20012 (8:4012)
+SFX_Triangle1_2::
 	db CH7
 	dw SFX_Triangle1_2_Ch1
 
-SFX_Triangle2_2:: ; 20015 (8:4015)
+SFX_Triangle2_2::
 	db CH7
 	dw SFX_Triangle2_2_Ch1
 
-SFX_Snare6_2:: ; 20018 (8:4018)
+SFX_Snare6_2::
 	db CH7
 	dw SFX_Snare6_2_Ch1
 
-SFX_Snare7_2:: ; 2001b (8:401b)
+SFX_Snare7_2::
 	db CH7
 	dw SFX_Snare7_2_Ch1
 
-SFX_Snare8_2:: ; 2001e (8:401e)
+SFX_Snare8_2::
 	db CH7
 	dw SFX_Snare8_2_Ch1
 
-SFX_Snare9_2:: ; 20021 (8:4021)
+SFX_Snare9_2::
 	db CH7
 	dw SFX_Snare9_2_Ch1
 
-SFX_Cymbal1_2:: ; 20024 (8:4024)
+SFX_Cymbal1_2::
 	db CH7
 	dw SFX_Cymbal1_2_Ch1
 
-SFX_Cymbal2_2:: ; 20027 (8:4027)
+SFX_Cymbal2_2::
 	db CH7
 	dw SFX_Cymbal2_2_Ch1
 
-SFX_Cymbal3_2:: ; 2002a (8:402a)
+SFX_Cymbal3_2::
 	db CH7
 	dw SFX_Cymbal3_2_Ch1
 
-SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+SFX_Muted_Snare1_2::
 	db CH7
 	dw SFX_Muted_Snare1_2_Ch1
 
-SFX_Triangle3_2:: ; 20030 (8:4030)
+SFX_Triangle3_2::
 	db CH7
 	dw SFX_Triangle3_2_Ch1
 
-SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+SFX_Muted_Snare2_2::
 	db CH7
 	dw SFX_Muted_Snare2_2_Ch1
 
-SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+SFX_Muted_Snare3_2::
 	db CH7
 	dw SFX_Muted_Snare3_2_Ch1
 
-SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+SFX_Muted_Snare4_2::
 	db CH7
 	dw SFX_Muted_Snare4_2_Ch1
 
-SFX_Cry00_2:: ; 2003c (8:403c)
+SFX_Cry00_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_2_Ch1
 	db CH5
@@ -85,7 +85,7 @@ SFX_Cry00_2:: ; 2003c (8:403c)
 	db CH7
 	dw SFX_Cry00_2_Ch3
 
-SFX_Cry01_2:: ; 20045 (8:4045)
+SFX_Cry01_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_2_Ch1
 	db CH5
@@ -93,7 +93,7 @@ SFX_Cry01_2:: ; 20045 (8:4045)
 	db CH7
 	dw SFX_Cry01_2_Ch3
 
-SFX_Cry02_2:: ; 2004e (8:404e)
+SFX_Cry02_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_2_Ch1
 	db CH5
@@ -101,7 +101,7 @@ SFX_Cry02_2:: ; 2004e (8:404e)
 	db CH7
 	dw SFX_Cry02_2_Ch3
 
-SFX_Cry03_2:: ; 20057 (8:4057)
+SFX_Cry03_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_2_Ch1
 	db CH5
@@ -109,7 +109,7 @@ SFX_Cry03_2:: ; 20057 (8:4057)
 	db CH7
 	dw SFX_Cry03_2_Ch3
 
-SFX_Cry04_2:: ; 20060 (8:4060)
+SFX_Cry04_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_2_Ch1
 	db CH5
@@ -117,7 +117,7 @@ SFX_Cry04_2:: ; 20060 (8:4060)
 	db CH7
 	dw SFX_Cry04_2_Ch3
 
-SFX_Cry05_2:: ; 20069 (8:4069)
+SFX_Cry05_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_2_Ch1
 	db CH5
@@ -125,7 +125,7 @@ SFX_Cry05_2:: ; 20069 (8:4069)
 	db CH7
 	dw SFX_Cry05_2_Ch3
 
-SFX_Cry06_2:: ; 20072 (8:4072)
+SFX_Cry06_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_2_Ch1
 	db CH5
@@ -133,7 +133,7 @@ SFX_Cry06_2:: ; 20072 (8:4072)
 	db CH7
 	dw SFX_Cry06_2_Ch3
 
-SFX_Cry07_2:: ; 2007b (8:407b)
+SFX_Cry07_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_2_Ch1
 	db CH5
@@ -141,7 +141,7 @@ SFX_Cry07_2:: ; 2007b (8:407b)
 	db CH7
 	dw SFX_Cry07_2_Ch3
 
-SFX_Cry08_2:: ; 20084 (8:4084)
+SFX_Cry08_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_2_Ch1
 	db CH5
@@ -149,7 +149,7 @@ SFX_Cry08_2:: ; 20084 (8:4084)
 	db CH7
 	dw SFX_Cry08_2_Ch3
 
-SFX_Cry09_2:: ; 2008d (8:408d)
+SFX_Cry09_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_2_Ch1
 	db CH5
@@ -157,7 +157,7 @@ SFX_Cry09_2:: ; 2008d (8:408d)
 	db CH7
 	dw SFX_Cry09_2_Ch3
 
-SFX_Cry0A_2:: ; 20096 (8:4096)
+SFX_Cry0A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_2_Ch1
 	db CH5
@@ -165,7 +165,7 @@ SFX_Cry0A_2:: ; 20096 (8:4096)
 	db CH7
 	dw SFX_Cry0A_2_Ch3
 
-SFX_Cry0B_2:: ; 2009f (8:409f)
+SFX_Cry0B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_2_Ch1
 	db CH5
@@ -173,7 +173,7 @@ SFX_Cry0B_2:: ; 2009f (8:409f)
 	db CH7
 	dw SFX_Cry0B_2_Ch3
 
-SFX_Cry0C_2:: ; 200a8 (8:40a8)
+SFX_Cry0C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_2_Ch1
 	db CH5
@@ -181,7 +181,7 @@ SFX_Cry0C_2:: ; 200a8 (8:40a8)
 	db CH7
 	dw SFX_Cry0C_2_Ch3
 
-SFX_Cry0D_2:: ; 200b1 (8:40b1)
+SFX_Cry0D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_2_Ch1
 	db CH5
@@ -189,7 +189,7 @@ SFX_Cry0D_2:: ; 200b1 (8:40b1)
 	db CH7
 	dw SFX_Cry0D_2_Ch3
 
-SFX_Cry0E_2:: ; 200ba (8:40ba)
+SFX_Cry0E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_2_Ch1
 	db CH5
@@ -197,7 +197,7 @@ SFX_Cry0E_2:: ; 200ba (8:40ba)
 	db CH7
 	dw SFX_Cry0E_2_Ch3
 
-SFX_Cry0F_2:: ; 200c3 (8:40c3)
+SFX_Cry0F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_2_Ch1
 	db CH5
@@ -205,7 +205,7 @@ SFX_Cry0F_2:: ; 200c3 (8:40c3)
 	db CH7
 	dw SFX_Cry0F_2_Ch3
 
-SFX_Cry10_2:: ; 200cc (8:40cc)
+SFX_Cry10_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_2_Ch1
 	db CH5
@@ -213,7 +213,7 @@ SFX_Cry10_2:: ; 200cc (8:40cc)
 	db CH7
 	dw SFX_Cry10_2_Ch3
 
-SFX_Cry11_2:: ; 200d5 (8:40d5)
+SFX_Cry11_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_2_Ch1
 	db CH5
@@ -221,7 +221,7 @@ SFX_Cry11_2:: ; 200d5 (8:40d5)
 	db CH7
 	dw SFX_Cry11_2_Ch3
 
-SFX_Cry12_2:: ; 200de (8:40de)
+SFX_Cry12_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_2_Ch1
 	db CH5
@@ -229,7 +229,7 @@ SFX_Cry12_2:: ; 200de (8:40de)
 	db CH7
 	dw SFX_Cry12_2_Ch3
 
-SFX_Cry13_2:: ; 200e7 (8:40e7)
+SFX_Cry13_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_2_Ch1
 	db CH5
@@ -237,7 +237,7 @@ SFX_Cry13_2:: ; 200e7 (8:40e7)
 	db CH7
 	dw SFX_Cry13_2_Ch3
 
-SFX_Cry14_2:: ; 200f0 (8:40f0)
+SFX_Cry14_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_2_Ch1
 	db CH5
@@ -245,7 +245,7 @@ SFX_Cry14_2:: ; 200f0 (8:40f0)
 	db CH7
 	dw SFX_Cry14_2_Ch3
 
-SFX_Cry15_2:: ; 200f9 (8:40f9)
+SFX_Cry15_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_2_Ch1
 	db CH5
@@ -253,7 +253,7 @@ SFX_Cry15_2:: ; 200f9 (8:40f9)
 	db CH7
 	dw SFX_Cry15_2_Ch3
 
-SFX_Cry16_2:: ; 20102 (8:4102)
+SFX_Cry16_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_2_Ch1
 	db CH5
@@ -261,7 +261,7 @@ SFX_Cry16_2:: ; 20102 (8:4102)
 	db CH7
 	dw SFX_Cry16_2_Ch3
 
-SFX_Cry17_2:: ; 2010b (8:410b)
+SFX_Cry17_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_2_Ch1
 	db CH5
@@ -269,7 +269,7 @@ SFX_Cry17_2:: ; 2010b (8:410b)
 	db CH7
 	dw SFX_Cry17_2_Ch3
 
-SFX_Cry18_2:: ; 20114 (8:4114)
+SFX_Cry18_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_2_Ch1
 	db CH5
@@ -277,7 +277,7 @@ SFX_Cry18_2:: ; 20114 (8:4114)
 	db CH7
 	dw SFX_Cry18_2_Ch3
 
-SFX_Cry19_2:: ; 2011d (8:411d)
+SFX_Cry19_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_2_Ch1
 	db CH5
@@ -285,7 +285,7 @@ SFX_Cry19_2:: ; 2011d (8:411d)
 	db CH7
 	dw SFX_Cry19_2_Ch3
 
-SFX_Cry1A_2:: ; 20126 (8:4126)
+SFX_Cry1A_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_2_Ch1
 	db CH5
@@ -293,7 +293,7 @@ SFX_Cry1A_2:: ; 20126 (8:4126)
 	db CH7
 	dw SFX_Cry1A_2_Ch3
 
-SFX_Cry1B_2:: ; 2012f (8:412f)
+SFX_Cry1B_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_2_Ch1
 	db CH5
@@ -301,7 +301,7 @@ SFX_Cry1B_2:: ; 2012f (8:412f)
 	db CH7
 	dw SFX_Cry1B_2_Ch3
 
-SFX_Cry1C_2:: ; 20138 (8:4138)
+SFX_Cry1C_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_2_Ch1
 	db CH5
@@ -309,7 +309,7 @@ SFX_Cry1C_2:: ; 20138 (8:4138)
 	db CH7
 	dw SFX_Cry1C_2_Ch3
 
-SFX_Cry1D_2:: ; 20141 (8:4141)
+SFX_Cry1D_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_2_Ch1
 	db CH5
@@ -317,7 +317,7 @@ SFX_Cry1D_2:: ; 20141 (8:4141)
 	db CH7
 	dw SFX_Cry1D_2_Ch3
 
-SFX_Cry1E_2:: ; 2014a (8:414a)
+SFX_Cry1E_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_2_Ch1
 	db CH5
@@ -325,7 +325,7 @@ SFX_Cry1E_2:: ; 2014a (8:414a)
 	db CH7
 	dw SFX_Cry1E_2_Ch3
 
-SFX_Cry1F_2:: ; 20153 (8:4153)
+SFX_Cry1F_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_2_Ch1
 	db CH5
@@ -333,7 +333,7 @@ SFX_Cry1F_2:: ; 20153 (8:4153)
 	db CH7
 	dw SFX_Cry1F_2_Ch3
 
-SFX_Cry20_2:: ; 2015c (8:415c)
+SFX_Cry20_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_2_Ch1
 	db CH5
@@ -341,7 +341,7 @@ SFX_Cry20_2:: ; 2015c (8:415c)
 	db CH7
 	dw SFX_Cry20_2_Ch3
 
-SFX_Cry21_2:: ; 20165 (8:4165)
+SFX_Cry21_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_2_Ch1
 	db CH5
@@ -349,7 +349,7 @@ SFX_Cry21_2:: ; 20165 (8:4165)
 	db CH7
 	dw SFX_Cry21_2_Ch3
 
-SFX_Cry22_2:: ; 2016e (8:416e)
+SFX_Cry22_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_2_Ch1
 	db CH5
@@ -357,7 +357,7 @@ SFX_Cry22_2:: ; 2016e (8:416e)
 	db CH7
 	dw SFX_Cry22_2_Ch3
 
-SFX_Cry23_2:: ; 20177 (8:4177)
+SFX_Cry23_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_2_Ch1
 	db CH5
@@ -365,7 +365,7 @@ SFX_Cry23_2:: ; 20177 (8:4177)
 	db CH7
 	dw SFX_Cry23_2_Ch3
 
-SFX_Cry24_2:: ; 20180 (8:4180)
+SFX_Cry24_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_2_Ch1
 	db CH5
@@ -373,7 +373,7 @@ SFX_Cry24_2:: ; 20180 (8:4180)
 	db CH7
 	dw SFX_Cry24_2_Ch3
 
-SFX_Cry25_2:: ; 20189 (8:4189)
+SFX_Cry25_2::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_2_Ch1
 	db CH5
@@ -381,7 +381,7 @@ SFX_Cry25_2:: ; 20189 (8:4189)
 	db CH7
 	dw SFX_Cry25_2_Ch3
 
-SFX_Level_Up:: ; 20192 (8:4192)
+SFX_Level_Up::
 	db ( $80 | CH4 )
 	dw SFX_Level_Up_Ch1
 	db CH5
@@ -389,7 +389,7 @@ SFX_Level_Up:: ; 20192 (8:4192)
 	db CH6
 	dw SFX_Level_Up_Ch3
 
-SFX_Get_Item2_2:: ; 2019b (8:419b)
+SFX_Get_Item2_2::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_2_Ch1
 	db CH5
@@ -397,55 +397,55 @@ SFX_Get_Item2_2:: ; 2019b (8:419b)
 	db CH6
 	dw SFX_Get_Item2_2_Ch3
 
-SFX_Tink_2:: ; 201a4 (8:41a4)
+SFX_Tink_2::
 	db CH4
 	dw SFX_Tink_2_Ch1
 
-SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+SFX_Heal_HP_2::
 	db CH4
 	dw SFX_Heal_HP_2_Ch1
 
-SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+SFX_Heal_Ailment_2::
 	db CH4
 	dw SFX_Heal_Ailment_2_Ch1
 
-SFX_Start_Menu_2:: ; 201ad (8:41ad)
+SFX_Start_Menu_2::
 	db CH7
 	dw SFX_Start_Menu_2_Ch1
 
-SFX_Press_AB_2:: ; 201b0 (8:41b0)
+SFX_Press_AB_2::
 	db CH4
 	dw SFX_Press_AB_2_Ch1
 
-SFX_Ball_Toss:: ; 201b3 (8:41b3)
+SFX_Ball_Toss::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Toss_Ch1
 	db CH5
 	dw SFX_Ball_Toss_Ch2
 
-SFX_Ball_Poof:: ; 201b9 (8:41b9)
+SFX_Ball_Poof::
 	db ( $40 | CH4 )
 	dw SFX_Ball_Poof_Ch1
 	db CH7
 	dw SFX_Ball_Poof_Ch2
 
-SFX_Faint_Thud:: ; 201bf (8:41bf)
+SFX_Faint_Thud::
 	db ( $40 | CH4 )
 	dw SFX_Faint_Thud_Ch1
 	db CH7
 	dw SFX_Faint_Thud_Ch2
 
-SFX_Run:: ; 201c5 (8:41c5)
+SFX_Run::
 	db CH7
 	dw SFX_Run_Ch1
 
-SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+SFX_Dex_Page_Added::
 	db ( $40 | CH4 )
 	dw SFX_Dex_Page_Added_Ch1
 	db CH5
 	dw SFX_Dex_Page_Added_Ch2
 
-SFX_Caught_Mon:: ; 201ce (8:41ce)
+SFX_Caught_Mon::
 	db ( $80 | CH4 )
 	dw SFX_Caught_Mon_Ch1
 	db CH5
@@ -453,139 +453,139 @@ SFX_Caught_Mon:: ; 201ce (8:41ce)
 	db CH6
 	dw SFX_Caught_Mon_Ch3
 
-SFX_Peck:: ; 201d7 (8:41d7)
+SFX_Peck::
 	db CH7
 	dw SFX_Peck_Ch1
 
-SFX_Faint_Fall:: ; 201da (8:41da)
+SFX_Faint_Fall::
 	db CH4
 	dw SFX_Faint_Fall_Ch1
 
-SFX_Battle_09:: ; 201dd (8:41dd)
+SFX_Battle_09::
 	db CH4
 	dw SFX_Battle_09_Ch1
 
-SFX_Pound:: ; 201e0 (8:41e0)
+SFX_Pound::
 	db CH7
 	dw SFX_Pound_Ch1
 
-SFX_Battle_0B:: ; 201e3 (8:41e3)
+SFX_Battle_0B::
 	db CH7
 	dw SFX_Battle_0B_Ch1
 
-SFX_Battle_0C:: ; 201e6 (8:41e6)
+SFX_Battle_0C::
 	db CH7
 	dw SFX_Battle_0C_Ch1
 
-SFX_Battle_0D:: ; 201e9 (8:41e9)
+SFX_Battle_0D::
 	db CH7
 	dw SFX_Battle_0D_Ch1
 
-SFX_Battle_0E:: ; 201ec (8:41ec)
+SFX_Battle_0E::
 	db CH7
 	dw SFX_Battle_0E_Ch1
 
-SFX_Battle_0F:: ; 201ef (8:41ef)
+SFX_Battle_0F::
 	db CH7
 	dw SFX_Battle_0F_Ch1
 
-SFX_Damage:: ; 201f2 (8:41f2)
+SFX_Damage::
 	db CH7
 	dw SFX_Damage_Ch1
 
-SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+SFX_Not_Very_Effective::
 	db CH7
 	dw SFX_Not_Very_Effective_Ch1
 
-SFX_Battle_12:: ; 201f8 (8:41f8)
+SFX_Battle_12::
 	db CH7
 	dw SFX_Battle_12_Ch1
 
-SFX_Battle_13:: ; 201fb (8:41fb)
+SFX_Battle_13::
 	db CH7
 	dw SFX_Battle_13_Ch1
 
-SFX_Battle_14:: ; 201fe (8:41fe)
+SFX_Battle_14::
 	db CH7
 	dw SFX_Battle_14_Ch1
 
-SFX_Vine_Whip:: ; 20201 (8:4201)
+SFX_Vine_Whip::
 	db CH7
 	dw SFX_Vine_Whip_Ch1
 
-SFX_Battle_16:: ; 20204 (8:4204)
+SFX_Battle_16::
 	db CH7
 	dw SFX_Battle_16_Ch1
 
-SFX_Battle_17:: ; 20207 (8:4207)
+SFX_Battle_17::
 	db CH7
 	dw SFX_Battle_17_Ch1
 
-SFX_Battle_18:: ; 2020a (8:420a)
+SFX_Battle_18::
 	db CH7
 	dw SFX_Battle_18_Ch1
 
-SFX_Battle_19:: ; 2020d (8:420d)
+SFX_Battle_19::
 	db CH7
 	dw SFX_Battle_19_Ch1
 
-SFX_Super_Effective:: ; 20210 (8:4210)
+SFX_Super_Effective::
 	db CH7
 	dw SFX_Super_Effective_Ch1
 
-SFX_Battle_1B:: ; 20213 (8:4213)
+SFX_Battle_1B::
 	db CH7
 	dw SFX_Battle_1B_Ch1
 
-SFX_Battle_1C:: ; 20216 (8:4216)
+SFX_Battle_1C::
 	db CH7
 	dw SFX_Battle_1C_Ch1
 
-SFX_Doubleslap:: ; 20219 (8:4219)
+SFX_Doubleslap::
 	db CH7
 	dw SFX_Doubleslap_Ch1
 
-SFX_Battle_1E:: ; 2021c (8:421c)
+SFX_Battle_1E::
 	db ( $40 | CH4 )
 	dw SFX_Battle_1E_Ch1
 	db CH7
 	dw SFX_Battle_1E_Ch2
 
-SFX_Horn_Drill:: ; 20222 (8:4222)
+SFX_Horn_Drill::
 	db CH7
 	dw SFX_Horn_Drill_Ch1
 
-SFX_Battle_20:: ; 20225 (8:4225)
+SFX_Battle_20::
 	db CH7
 	dw SFX_Battle_20_Ch1
 
-SFX_Battle_21:: ; 20228 (8:4228)
+SFX_Battle_21::
 	db CH7
 	dw SFX_Battle_21_Ch1
 
-SFX_Battle_22:: ; 2022b (8:422b)
+SFX_Battle_22::
 	db CH7
 	dw SFX_Battle_22_Ch1
 
-SFX_Battle_23:: ; 2022e (8:422e)
+SFX_Battle_23::
 	db CH7
 	dw SFX_Battle_23_Ch1
 
-SFX_Battle_24:: ; 20231 (8:4231)
+SFX_Battle_24::
 	db ( $40 | CH4 )
 	dw SFX_Battle_24_Ch1
 	db CH7
 	dw SFX_Battle_24_Ch2
 
-SFX_Battle_25:: ; 20237 (8:4237)
+SFX_Battle_25::
 	db CH7
 	dw SFX_Battle_25_Ch1
 
-SFX_Battle_26:: ; 2023a (8:423a)
+SFX_Battle_26::
 	db CH7
 	dw SFX_Battle_26_Ch1
 
-SFX_Battle_27:: ; 2023d (8:423d)
+SFX_Battle_27::
 	db ( $80 | CH4 )
 	dw SFX_Battle_27_Ch1
 	db CH5
@@ -593,7 +593,7 @@ SFX_Battle_27:: ; 2023d (8:423d)
 	db CH7
 	dw SFX_Battle_27_Ch3
 
-SFX_Battle_28:: ; 20246 (8:4246)
+SFX_Battle_28::
 	db ( $80 | CH4 )
 	dw SFX_Battle_28_Ch1
 	db CH5
@@ -601,13 +601,13 @@ SFX_Battle_28:: ; 20246 (8:4246)
 	db CH7
 	dw SFX_Battle_28_Ch3
 
-SFX_Battle_29:: ; 2024f (8:424f)
+SFX_Battle_29::
 	db ( $40 | CH4 )
 	dw SFX_Battle_29_Ch1
 	db CH7
 	dw SFX_Battle_29_Ch2
 
-SFX_Battle_2A:: ; 20255 (8:4255)
+SFX_Battle_2A::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2A_Ch1
 	db CH5
@@ -615,13 +615,13 @@ SFX_Battle_2A:: ; 20255 (8:4255)
 	db CH7
 	dw SFX_Battle_2A_Ch3
 
-SFX_Battle_2B:: ; 2025e (8:425e)
+SFX_Battle_2B::
 	db ( $40 | CH4 )
 	dw SFX_Battle_2B_Ch1
 	db CH7
 	dw SFX_Battle_2B_Ch2
 
-SFX_Battle_2C:: ; 20264 (8:4264)
+SFX_Battle_2C::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2C_Ch1
 	db CH5
@@ -629,7 +629,7 @@ SFX_Battle_2C:: ; 20264 (8:4264)
 	db CH7
 	dw SFX_Battle_2C_Ch3
 
-SFX_Psybeam:: ; 2026d (8:426d)
+SFX_Psybeam::
 	db ( $80 | CH4 )
 	dw SFX_Psybeam_Ch1
 	db CH5
@@ -637,7 +637,7 @@ SFX_Psybeam:: ; 2026d (8:426d)
 	db CH7
 	dw SFX_Psybeam_Ch3
 
-SFX_Battle_2E:: ; 20276 (8:4276)
+SFX_Battle_2E::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2E_Ch1
 	db CH5
@@ -645,7 +645,7 @@ SFX_Battle_2E:: ; 20276 (8:4276)
 	db CH7
 	dw SFX_Battle_2E_Ch3
 
-SFX_Battle_2F:: ; 2027f (8:427f)
+SFX_Battle_2F::
 	db ( $80 | CH4 )
 	dw SFX_Battle_2F_Ch1
 	db CH5
@@ -653,7 +653,7 @@ SFX_Battle_2F:: ; 2027f (8:427f)
 	db CH7
 	dw SFX_Battle_2F_Ch3
 
-SFX_Psychic_M:: ; 20288 (8:4288)
+SFX_Psychic_M::
 	db ( $80 | CH4 )
 	dw SFX_Psychic_M_Ch1
 	db CH5
@@ -661,25 +661,25 @@ SFX_Psychic_M:: ; 20288 (8:4288)
 	db CH7
 	dw SFX_Psychic_M_Ch3
 
-SFX_Battle_31:: ; 20291 (8:4291)
+SFX_Battle_31::
 	db ( $40 | CH4 )
 	dw SFX_Battle_31_Ch1
 	db CH5
 	dw SFX_Battle_31_Ch2
 
-SFX_Battle_32:: ; 20297 (8:4297)
+SFX_Battle_32::
 	db ( $40 | CH4 )
 	dw SFX_Battle_32_Ch1
 	db CH5
 	dw SFX_Battle_32_Ch2
 
-SFX_Battle_33:: ; 2029d (8:429d)
+SFX_Battle_33::
 	db ( $40 | CH4 )
 	dw SFX_Battle_33_Ch1
 	db CH5
 	dw SFX_Battle_33_Ch2
 
-SFX_Battle_34:: ; 202a3 (8:42a3)
+SFX_Battle_34::
 	db ( $80 | CH4 )
 	dw SFX_Battle_34_Ch1
 	db CH5
@@ -687,13 +687,13 @@ SFX_Battle_34:: ; 202a3 (8:42a3)
 	db CH7
 	dw SFX_Battle_34_Ch3
 
-SFX_Battle_35:: ; 202ac (8:42ac)
+SFX_Battle_35::
 	db ( $40 | CH4 )
 	dw SFX_Battle_35_Ch1
 	db CH5
 	dw SFX_Battle_35_Ch2
 
-SFX_Battle_36:: ; 202b2 (8:42b2)
+SFX_Battle_36::
 	db ( $80 | CH4 )
 	dw SFX_Battle_36_Ch1
 	db CH5
@@ -701,6 +701,6 @@ SFX_Battle_36:: ; 202b2 (8:42b2)
 	db CH7
 	dw SFX_Battle_36_Ch3
 
-SFX_Silph_Scope:: ; 202bb (8:42bb)
+SFX_Silph_Scope::
 	db CH4
 	dw SFX_Silph_Scope_Ch1

audio/headers/sfxheaders3.asm

@@ -1,83 +1,83 @@
 SFX_Headers_3::
 	db $ff, $ff, $ff ; padding
 
-SFX_Snare1_3:: ; 7c003 (1f:4003)
+SFX_Snare1_3::
 	db CH7
 	dw SFX_Snare1_3_Ch1
 
-SFX_Snare2_3:: ; 7c006 (1f:4006)
+SFX_Snare2_3::
 	db CH7
 	dw SFX_Snare2_3_Ch1
 
-SFX_Snare3_3:: ; 7c009 (1f:4009)
+SFX_Snare3_3::
 	db CH7
 	dw SFX_Snare3_3_Ch1
 
-SFX_Snare4_3:: ; 7c00c (1f:400c)
+SFX_Snare4_3::
 	db CH7
 	dw SFX_Snare4_3_Ch1
 
-SFX_Snare5_3:: ; 7c00f (1f:400f)
+SFX_Snare5_3::
 	db CH7
 	dw SFX_Snare5_3_Ch1
 
-SFX_Triangle1_3:: ; 7c012 (1f:4012)
+SFX_Triangle1_3::
 	db CH7
 	dw SFX_Triangle1_3_Ch1
 
-SFX_Triangle2_3:: ; 7c015 (1f:4015)
+SFX_Triangle2_3::
 	db CH7
 	dw SFX_Triangle2_3_Ch1
 
-SFX_Snare6_3:: ; 7c018 (1f:4018)
+SFX_Snare6_3::
 	db CH7
 	dw SFX_Snare6_3_Ch1
 
-SFX_Snare7_3:: ; 7c01b (1f:401b)
+SFX_Snare7_3::
 	db CH7
 	dw SFX_Snare7_3_Ch1
 
-SFX_Snare8_3:: ; 7c01e (1f:401e)
+SFX_Snare8_3::
 	db CH7
 	dw SFX_Snare8_3_Ch1
 
-SFX_Snare9_3:: ; 7c021 (1f:4021)
+SFX_Snare9_3::
 	db CH7
 	dw SFX_Snare9_3_Ch1
 
-SFX_Cymbal1_3:: ; 7c024 (1f:4024)
+SFX_Cymbal1_3::
 	db CH7
 	dw SFX_Cymbal1_3_Ch1
 
-SFX_Cymbal2_3:: ; 7c027 (1f:4027)
+SFX_Cymbal2_3::
 	db CH7
 	dw SFX_Cymbal2_3_Ch1
 
-SFX_Cymbal3_3:: ; 7c02a (1f:402a)
+SFX_Cymbal3_3::
 	db CH7
 	dw SFX_Cymbal3_3_Ch1
 
-SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
+SFX_Muted_Snare1_3::
 	db CH7
 	dw SFX_Muted_Snare1_3_Ch1
 
-SFX_Triangle3_3:: ; 7c030 (1f:4030)
+SFX_Triangle3_3::
 	db CH7
 	dw SFX_Triangle3_3_Ch1
 
-SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
+SFX_Muted_Snare2_3::
 	db CH7
 	dw SFX_Muted_Snare2_3_Ch1
 
-SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
+SFX_Muted_Snare3_3::
 	db CH7
 	dw SFX_Muted_Snare3_3_Ch1
 
-SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
+SFX_Muted_Snare4_3::
 	db CH7
 	dw SFX_Muted_Snare4_3_Ch1
 
-SFX_Cry00_3:: ; 7c03c (1f:403c)
+SFX_Cry00_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry00_3_Ch1
 	db CH5
@@ -85,7 +85,7 @@ SFX_Cry00_3:: ; 7c03c (1f:403c)
 	db CH7
 	dw SFX_Cry00_3_Ch3
 
-SFX_Cry01_3:: ; 7c045 (1f:4045)
+SFX_Cry01_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry01_3_Ch1
 	db CH5
@@ -93,7 +93,7 @@ SFX_Cry01_3:: ; 7c045 (1f:4045)
 	db CH7
 	dw SFX_Cry01_3_Ch3
 
-SFX_Cry02_3:: ; 7c04e (1f:404e)
+SFX_Cry02_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry02_3_Ch1
 	db CH5
@@ -101,7 +101,7 @@ SFX_Cry02_3:: ; 7c04e (1f:404e)
 	db CH7
 	dw SFX_Cry02_3_Ch3
 
-SFX_Cry03_3:: ; 7c057 (1f:4057)
+SFX_Cry03_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry03_3_Ch1
 	db CH5
@@ -109,7 +109,7 @@ SFX_Cry03_3:: ; 7c057 (1f:4057)
 	db CH7
 	dw SFX_Cry03_3_Ch3
 
-SFX_Cry04_3:: ; 7c060 (1f:4060)
+SFX_Cry04_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry04_3_Ch1
 	db CH5
@@ -117,7 +117,7 @@ SFX_Cry04_3:: ; 7c060 (1f:4060)
 	db CH7
 	dw SFX_Cry04_3_Ch3
 
-SFX_Cry05_3:: ; 7c069 (1f:4069)
+SFX_Cry05_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry05_3_Ch1
 	db CH5
@@ -125,7 +125,7 @@ SFX_Cry05_3:: ; 7c069 (1f:4069)
 	db CH7
 	dw SFX_Cry05_3_Ch3
 
-SFX_Cry06_3:: ; 7c072 (1f:4072)
+SFX_Cry06_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry06_3_Ch1
 	db CH5
@@ -133,7 +133,7 @@ SFX_Cry06_3:: ; 7c072 (1f:4072)
 	db CH7
 	dw SFX_Cry06_3_Ch3
 
-SFX_Cry07_3:: ; 7c07b (1f:407b)
+SFX_Cry07_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry07_3_Ch1
 	db CH5
@@ -141,7 +141,7 @@ SFX_Cry07_3:: ; 7c07b (1f:407b)
 	db CH7
 	dw SFX_Cry07_3_Ch3
 
-SFX_Cry08_3:: ; 7c084 (1f:4084)
+SFX_Cry08_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry08_3_Ch1
 	db CH5
@@ -149,7 +149,7 @@ SFX_Cry08_3:: ; 7c084 (1f:4084)
 	db CH7
 	dw SFX_Cry08_3_Ch3
 
-SFX_Cry09_3:: ; 7c08d (1f:408d)
+SFX_Cry09_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry09_3_Ch1
 	db CH5
@@ -157,7 +157,7 @@ SFX_Cry09_3:: ; 7c08d (1f:408d)
 	db CH7
 	dw SFX_Cry09_3_Ch3
 
-SFX_Cry0A_3:: ; 7c096 (1f:4096)
+SFX_Cry0A_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0A_3_Ch1
 	db CH5
@@ -165,7 +165,7 @@ SFX_Cry0A_3:: ; 7c096 (1f:4096)
 	db CH7
 	dw SFX_Cry0A_3_Ch3
 
-SFX_Cry0B_3:: ; 7c09f (1f:409f)
+SFX_Cry0B_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0B_3_Ch1
 	db CH5
@@ -173,7 +173,7 @@ SFX_Cry0B_3:: ; 7c09f (1f:409f)
 	db CH7
 	dw SFX_Cry0B_3_Ch3
 
-SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
+SFX_Cry0C_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0C_3_Ch1
 	db CH5
@@ -181,7 +181,7 @@ SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
 	db CH7
 	dw SFX_Cry0C_3_Ch3
 
-SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
+SFX_Cry0D_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0D_3_Ch1
 	db CH5
@@ -189,7 +189,7 @@ SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
 	db CH7
 	dw SFX_Cry0D_3_Ch3
 
-SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
+SFX_Cry0E_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0E_3_Ch1
 	db CH5
@@ -197,7 +197,7 @@ SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
 	db CH7
 	dw SFX_Cry0E_3_Ch3
 
-SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
+SFX_Cry0F_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry0F_3_Ch1
 	db CH5
@@ -205,7 +205,7 @@ SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
 	db CH7
 	dw SFX_Cry0F_3_Ch3
 
-SFX_Cry10_3:: ; 7c0cc (1f:40cc)
+SFX_Cry10_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry10_3_Ch1
 	db CH5
@@ -213,7 +213,7 @@ SFX_Cry10_3:: ; 7c0cc (1f:40cc)
 	db CH7
 	dw SFX_Cry10_3_Ch3
 
-SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
+SFX_Cry11_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry11_3_Ch1
 	db CH5
@@ -221,7 +221,7 @@ SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
 	db CH7
 	dw SFX_Cry11_3_Ch3
 
-SFX_Cry12_3:: ; 7c0de (1f:40de)
+SFX_Cry12_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry12_3_Ch1
 	db CH5
@@ -229,7 +229,7 @@ SFX_Cry12_3:: ; 7c0de (1f:40de)
 	db CH7
 	dw SFX_Cry12_3_Ch3
 
-SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
+SFX_Cry13_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry13_3_Ch1
 	db CH5
@@ -237,7 +237,7 @@ SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
 	db CH7
 	dw SFX_Cry13_3_Ch3
 
-SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
+SFX_Cry14_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry14_3_Ch1
 	db CH5
@@ -245,7 +245,7 @@ SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
 	db CH7
 	dw SFX_Cry14_3_Ch3
 
-SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
+SFX_Cry15_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry15_3_Ch1
 	db CH5
@@ -253,7 +253,7 @@ SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
 	db CH7
 	dw SFX_Cry15_3_Ch3
 
-SFX_Cry16_3:: ; 7c102 (1f:4102)
+SFX_Cry16_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry16_3_Ch1
 	db CH5
@@ -261,7 +261,7 @@ SFX_Cry16_3:: ; 7c102 (1f:4102)
 	db CH7
 	dw SFX_Cry16_3_Ch3
 
-SFX_Cry17_3:: ; 7c10b (1f:410b)
+SFX_Cry17_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry17_3_Ch1
 	db CH5
@@ -269,7 +269,7 @@ SFX_Cry17_3:: ; 7c10b (1f:410b)
 	db CH7
 	dw SFX_Cry17_3_Ch3
 
-SFX_Cry18_3:: ; 7c114 (1f:4114)
+SFX_Cry18_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry18_3_Ch1
 	db CH5
@@ -277,7 +277,7 @@ SFX_Cry18_3:: ; 7c114 (1f:4114)
 	db CH7
 	dw SFX_Cry18_3_Ch3
 
-SFX_Cry19_3:: ; 7c11d (1f:411d)
+SFX_Cry19_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry19_3_Ch1
 	db CH5
@@ -285,7 +285,7 @@ SFX_Cry19_3:: ; 7c11d (1f:411d)
 	db CH7
 	dw SFX_Cry19_3_Ch3
 
-SFX_Cry1A_3:: ; 7c126 (1f:4126)
+SFX_Cry1A_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1A_3_Ch1
 	db CH5
@@ -293,7 +293,7 @@ SFX_Cry1A_3:: ; 7c126 (1f:4126)
 	db CH7
 	dw SFX_Cry1A_3_Ch3
 
-SFX_Cry1B_3:: ; 7c12f (1f:412f)
+SFX_Cry1B_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1B_3_Ch1
 	db CH5
@@ -301,7 +301,7 @@ SFX_Cry1B_3:: ; 7c12f (1f:412f)
 	db CH7
 	dw SFX_Cry1B_3_Ch3
 
-SFX_Cry1C_3:: ; 7c138 (1f:4138)
+SFX_Cry1C_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1C_3_Ch1
 	db CH5
@@ -309,7 +309,7 @@ SFX_Cry1C_3:: ; 7c138 (1f:4138)
 	db CH7
 	dw SFX_Cry1C_3_Ch3
 
-SFX_Cry1D_3:: ; 7c141 (1f:4141)
+SFX_Cry1D_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1D_3_Ch1
 	db CH5
@@ -317,7 +317,7 @@ SFX_Cry1D_3:: ; 7c141 (1f:4141)
 	db CH7
 	dw SFX_Cry1D_3_Ch3
 
-SFX_Cry1E_3:: ; 7c14a (1f:414a)
+SFX_Cry1E_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1E_3_Ch1
 	db CH5
@@ -325,7 +325,7 @@ SFX_Cry1E_3:: ; 7c14a (1f:414a)
 	db CH7
 	dw SFX_Cry1E_3_Ch3
 
-SFX_Cry1F_3:: ; 7c153 (1f:4153)
+SFX_Cry1F_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry1F_3_Ch1
 	db CH5
@@ -333,7 +333,7 @@ SFX_Cry1F_3:: ; 7c153 (1f:4153)
 	db CH7
 	dw SFX_Cry1F_3_Ch3
 
-SFX_Cry20_3:: ; 7c15c (1f:415c)
+SFX_Cry20_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry20_3_Ch1
 	db CH5
@@ -341,7 +341,7 @@ SFX_Cry20_3:: ; 7c15c (1f:415c)
 	db CH7
 	dw SFX_Cry20_3_Ch3
 
-SFX_Cry21_3:: ; 7c165 (1f:4165)
+SFX_Cry21_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry21_3_Ch1
 	db CH5
@@ -349,7 +349,7 @@ SFX_Cry21_3:: ; 7c165 (1f:4165)
 	db CH7
 	dw SFX_Cry21_3_Ch3
 
-SFX_Cry22_3:: ; 7c16e (1f:416e)
+SFX_Cry22_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry22_3_Ch1
 	db CH5
@@ -357,7 +357,7 @@ SFX_Cry22_3:: ; 7c16e (1f:416e)
 	db CH7
 	dw SFX_Cry22_3_Ch3
 
-SFX_Cry23_3:: ; 7c177 (1f:4177)
+SFX_Cry23_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry23_3_Ch1
 	db CH5
@@ -365,7 +365,7 @@ SFX_Cry23_3:: ; 7c177 (1f:4177)
 	db CH7
 	dw SFX_Cry23_3_Ch3
 
-SFX_Cry24_3:: ; 7c180 (1f:4180)
+SFX_Cry24_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry24_3_Ch1
 	db CH5
@@ -373,7 +373,7 @@ SFX_Cry24_3:: ; 7c180 (1f:4180)
 	db CH7
 	dw SFX_Cry24_3_Ch3
 
-SFX_Cry25_3:: ; 7c189 (1f:4189)
+SFX_Cry25_3::
 	db ( $80 | CH4 )
 	dw SFX_Cry25_3_Ch1
 	db CH5
@@ -381,7 +381,7 @@ SFX_Cry25_3:: ; 7c189 (1f:4189)
 	db CH7
 	dw SFX_Cry25_3_Ch3
 
-SFX_Get_Item1_3:: ; 7c192 (1f:4192)
+SFX_Get_Item1_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item1_3_Ch1
 	db CH5
@@ -389,7 +389,7 @@ SFX_Get_Item1_3:: ; 7c192 (1f:4192)
 	db CH6
 	dw SFX_Get_Item1_3_Ch3
 
-SFX_Get_Item2_3:: ; 7c19b (1f:419b)
+SFX_Get_Item2_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Item2_3_Ch1
 	db CH5
@@ -397,27 +397,27 @@ SFX_Get_Item2_3:: ; 7c19b (1f:419b)
 	db CH6
 	dw SFX_Get_Item2_3_Ch3
 
-SFX_Tink_3:: ; 7c1a4 (1f:41a4)
+SFX_Tink_3::
 	db CH4
 	dw SFX_Tink_3_Ch1
 
-SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
+SFX_Heal_HP_3::
 	db CH4
 	dw SFX_Heal_HP_3_Ch1
 
-SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
+SFX_Heal_Ailment_3::
 	db CH4
 	dw SFX_Heal_Ailment_3_Ch1
 
-SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
+SFX_Start_Menu_3::
 	db CH7
 	dw SFX_Start_Menu_3_Ch1
 
-SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
+SFX_Press_AB_3::
 	db CH4
 	dw SFX_Press_AB_3_Ch1
 
-SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
+SFX_Pokedex_Rating_3::
 	db ( $80 | CH4 )
 	dw SFX_Pokedex_Rating_3_Ch1
 	db CH5
@@ -425,7 +425,7 @@ SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
 	db CH6
 	dw SFX_Pokedex_Rating_3_Ch3
 
-SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
+SFX_Get_Key_Item_3::
 	db ( $80 | CH4 )
 	dw SFX_Get_Key_Item_3_Ch1
 	db CH5
@@ -433,164 +433,164 @@ SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
 	db CH6
 	dw SFX_Get_Key_Item_3_Ch3
 
-SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
+SFX_Poisoned_3::
 	db CH4
 	dw SFX_Poisoned_3_Ch1
 
-SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
+SFX_Trade_Machine_3::
 	db CH4
 	dw SFX_Trade_Machine_3_Ch1
 
-SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
+SFX_Turn_On_PC_3::
 	db CH4
 	dw SFX_Turn_On_PC_3_Ch1
 
-SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
+SFX_Turn_Off_PC_3::
 	db CH4
 	dw SFX_Turn_Off_PC_3_Ch1
 
-SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
+SFX_Enter_PC_3::
 	db CH4
 	dw SFX_Enter_PC_3_Ch1
 
-SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
+SFX_Shrink_3::
 	db CH4
 	dw SFX_Shrink_3_Ch1
 
-SFX_Switch_3:: ; 7c1d7 (1f:41d7)
+SFX_Switch_3::
 	db CH4
 	dw SFX_Switch_3_Ch1
 
-SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
+SFX_Healing_Machine_3::
 	db CH4
 	dw SFX_Healing_Machine_3_Ch1
 
-SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
+SFX_Teleport_Exit1_3::
 	db CH4
 	dw SFX_Teleport_Exit1_3_Ch1
 
-SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
+SFX_Teleport_Enter1_3::
 	db CH4
 	dw SFX_Teleport_Enter1_3_Ch1
 
-SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
+SFX_Teleport_Exit2_3::
 	db CH4
 	dw SFX_Teleport_Exit2_3_Ch1
 
-SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
+SFX_Ledge_3::
 	db CH4
 	dw SFX_Ledge_3_Ch1
 
-SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
+SFX_Teleport_Enter2_3::
 	db CH7
 	dw SFX_Teleport_Enter2_3_Ch1
 
-SFX_Fly_3:: ; 7c1ec (1f:41ec)
+SFX_Fly_3::
 	db CH7
 	dw SFX_Fly_3_Ch1
 
-SFX_Denied_3:: ; 7c1ef (1f:41ef)
+SFX_Denied_3::
 	db ( $40 | CH4 )
 	dw SFX_Denied_3_Ch1
 	db CH5
 	dw SFX_Denied_3_Ch2
 
-SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
+SFX_Arrow_Tiles_3::
 	db CH4
 	dw SFX_Arrow_Tiles_3_Ch1
 
-SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
+SFX_Push_Boulder_3::
 	db CH7
 	dw SFX_Push_Boulder_3_Ch1
 
-SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
+SFX_SS_Anne_Horn_3::
 	db ( $40 | CH4 )
 	dw SFX_SS_Anne_Horn_3_Ch1
 	db CH5
 	dw SFX_SS_Anne_Horn_3_Ch2
 
-SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
+SFX_Withdraw_Deposit_3::
 	db CH4
 	dw SFX_Withdraw_Deposit_3_Ch1
 
-SFX_Cut_3:: ; 7c204 (1f:4204)
+SFX_Cut_3::
 	db CH7
 	dw SFX_Cut_3_Ch1
 
-SFX_Go_Inside_3:: ; 7c207 (1f:4207)
+SFX_Go_Inside_3::
 	db CH7
 	dw SFX_Go_Inside_3_Ch1
 
-SFX_Swap_3:: ; 7c20a (1f:420a)
+SFX_Swap_3::
 	db ( $40 | CH4 )
 	dw SFX_Swap_3_Ch1
 	db CH5
 	dw SFX_Swap_3_Ch2
 
-SFX_59_3:: ; 7c210 (1f:4210)
+SFX_59_3::
 	db ( $40 | CH4 )
 	dw SFX_59_3_Ch1
 	db CH5
 	dw SFX_59_3_Ch2
 
-SFX_Purchase_3:: ; 7c216 (1f:4216)
+SFX_Purchase_3::
 	db ( $40 | CH4 )
 	dw SFX_Purchase_3_Ch1
 	db CH5
 	dw SFX_Purchase_3_Ch2
 
-SFX_Collision_3:: ; 7c21c (1f:421c)
+SFX_Collision_3::
 	db CH4
 	dw SFX_Collision_3_Ch1
 
-SFX_Go_Outside_3:: ; 7c21f (1f:421f)
+SFX_Go_Outside_3::
 	db CH7
 	dw SFX_Go_Outside_3_Ch1
 
-SFX_Save_3:: ; 7c222 (1f:4222)
+SFX_Save_3::
 	db ( $40 | CH4 )
 	dw SFX_Save_3_Ch1
 	db CH5
 	dw SFX_Save_3_Ch2
 
-SFX_Intro_Lunge:: ; 7c228 (1f:4228)
+SFX_Intro_Lunge::
 	db CH7
 	dw SFX_Intro_Lunge_Ch1
 
-SFX_Intro_Hip:: ; 7c22b (1f:422b)
+SFX_Intro_Hip::
 	db CH4
 	dw SFX_Intro_Hip_Ch1
 
-SFX_Intro_Hop:: ; 7c22e (1f:422e)
+SFX_Intro_Hop::
 	db CH4
 	dw SFX_Intro_Hop_Ch1
 
-SFX_Intro_Raise:: ; 7c231 (1f:4231)
+SFX_Intro_Raise::
 	db CH7
 	dw SFX_Intro_Raise_Ch1
 
-SFX_Intro_Crash:: ; 7c234 (1f:4234)
+SFX_Intro_Crash::
 	db CH7
 	dw SFX_Intro_Crash_Ch1
 
-SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
+SFX_Intro_Whoosh::
 	db CH7
 	dw SFX_Intro_Whoosh_Ch1
 
-SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
+SFX_Slots_Stop_Wheel::
 	db CH4
 	dw SFX_Slots_Stop_Wheel_Ch1
 
-SFX_Slots_Reward:: ; 7c23d (1f:423d)
+SFX_Slots_Reward::
 	db CH4
 	dw SFX_Slots_Reward_Ch1
 
-SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
+SFX_Slots_New_Spin::
 	db ( $40 | CH4 )
 	dw SFX_Slots_New_Spin_Ch1
 	db CH5
 	dw SFX_Slots_New_Spin_Ch2
 
-SFX_Shooting_Star:: ; 7c246 (1f:4246)
+SFX_Shooting_Star::
 	db CH4
 	dw SFX_Shooting_Star_Ch1

audio/music/bikeriding.asm

@@ -1,4 +1,4 @@
-Music_BikeRiding_Ch1:: ; 7dbbb (1f:5bbb)
+Music_BikeRiding_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -153,7 +153,7 @@ Music_BikeRiding_branch_7dbc9::
 	loopchannel 0, Music_BikeRiding_branch_7dbc9
 
 
-Music_BikeRiding_Ch2:: ; 7dc6c (1f:5c6c)
+Music_BikeRiding_Ch2::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 3
@@ -302,7 +302,7 @@ Music_BikeRiding_branch_7dc75::
 	loopchannel 0, Music_BikeRiding_branch_7dc75
 
 
-Music_BikeRiding_Ch3:: ; 7dd14 (1f:5d14)
+Music_BikeRiding_Ch3::
 	notetype 12, 1, 3
 	rest 2
 
@@ -643,7 +643,7 @@ Music_BikeRiding_branch_7dd17::
 	loopchannel 0, Music_BikeRiding_branch_7dd17
 
 
-Music_BikeRiding_Ch4:: ; 7de68 (1f:5e68)
+Music_BikeRiding_Ch4::
 	dspeed 12
 	rest 2
 

audio/music/celadon.asm

@@ -1,4 +1,4 @@
-Music_Celadon_Ch1:: ; b6c7 (2:76c7)
+Music_Celadon_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -107,7 +107,7 @@ Music_Celadon_branch_b6d4::
 	loopchannel 0, Music_Celadon_branch_b6d4
 
 
-Music_Celadon_Ch2:: ; b73a (2:773a)
+Music_Celadon_Ch2::
 	duty 3
 	notetype 12, 12, 2
 	octave 4
@@ -226,7 +226,7 @@ Music_Celadon_branch_b74a::
 	loopchannel 0, Music_Celadon_branch_b74a
 
 
-Music_Celadon_Ch3:: ; b7b5 (2:77b5)
+Music_Celadon_Ch3::
 	notetype 12, 1, 3
 	rest 8
 	octave 5

audio/music/cinnabar.asm

@@ -1,4 +1,4 @@
-Music_Cinnabar_Ch1:: ; b86d (2:786d)
+Music_Cinnabar_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -85,7 +85,7 @@ Music_Cinnabar_branch_b878::
 	loopchannel 0, Music_Cinnabar_branch_b878
 
 
-Music_Cinnabar_Ch2:: ; b8d4 (2:78d4)
+Music_Cinnabar_Ch2::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -179,7 +179,7 @@ Music_Cinnabar_branch_b8d9::
 	loopchannel 0, Music_Cinnabar_branch_b8d9
 
 
-Music_Cinnabar_Ch3:: ; b93d (2:793d)
+Music_Cinnabar_Ch3::
 	notetype 12, 1, 0
 
 Music_Cinnabar_branch_b93f::

audio/music/cinnabarmansion.asm

@@ -1,4 +1,4 @@
-Music_CinnabarMansion_Ch1:: ; 7ed0f (1f:6d0f)
+Music_CinnabarMansion_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 11, 2, 5
@@ -38,7 +38,7 @@ Music_CinnabarMansion_branch_7ed19::
 	loopchannel 0, Music_CinnabarMansion_branch_7ed19
 
 
-Music_CinnabarMansion_Ch2:: ; 7ed40 (1f:6d40)
+Music_CinnabarMansion_Ch2::
 	duty 2
 	toggleperfectpitch
 	vibrato 10, 2, 4
@@ -95,7 +95,7 @@ Music_CinnabarMansion_branch_7ed6c::
 	endchannel
 
 
-Music_CinnabarMansion_Ch3:: ; 7ed7e (1f:6d7e)
+Music_CinnabarMansion_Ch3::
 	notetype 12, 1, 1
 
 Music_CinnabarMansion_branch_7ed80::
@@ -143,7 +143,7 @@ Music_CinnabarMansion_branch_7ed80::
 	loopchannel 0, Music_CinnabarMansion_branch_7ed80
 
 
-Music_CinnabarMansion_Ch4:: ; 7edb0 (1f:6db0)
+Music_CinnabarMansion_Ch4::
 	dspeed 6
 	rest 16
 	rest 16

audio/music/cities1.asm

@@ -2,7 +2,7 @@ Music_Cities1_branch_aa6f::
 	tempo 232
 	loopchannel 0, Music_Cities1_branch_aa79
 
-Music_Cities1_Ch1:: ; aa76 (2:6a76)
+Music_Cities1_Ch1::
 	tempo 144
 
 Music_Cities1_branch_aa79::
@@ -268,7 +268,7 @@ Music_Cities1_branch_ab8a::
 	endchannel
 
 
-Music_Cities1_Ch2:: ; ab92 (2:6b92)
+Music_Cities1_Ch2::
 	vibrato 5, 1, 5
 	callchannel Music_Cities1_branch_ac00
 	octave 4
@@ -401,7 +401,7 @@ Music_Cities1_branch_ac00::
 	endchannel
 
 
-Music_Cities1_Ch3:: ; ac32 (2:6c32)
+Music_Cities1_Ch3::
 	notetype 12, 1, 1
 	toggleperfectpitch
 
@@ -579,7 +579,7 @@ Music_Cities1_branch_acce::
 	endchannel
 
 
-Music_Cities1_Ch4:: ; acef (2:6cef)
+Music_Cities1_Ch4::
 	dspeed 12
 	callchannel Music_Cities1_branch_ad36
 

audio/music/cities2.asm

@@ -1,4 +1,4 @@
-Music_Cities2_Ch1:: ; b504 (2:7504)
+Music_Cities2_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -94,7 +94,7 @@ Music_Cities2_branch_b51a::
 	loopchannel 0, Music_Cities2_branch_b51a
 
 
-Music_Cities2_Ch2:: ; b569 (2:7569)
+Music_Cities2_Ch2::
 	duty 3
 	vibrato 8, 2, 3
 	notetype 12, 12, 2
@@ -280,7 +280,7 @@ Music_Cities2_branch_b58b::
 	loopchannel 0, Music_Cities2_branch_b58b
 
 
-Music_Cities2_Ch3:: ; b640 (2:7640)
+Music_Cities2_Ch3::
 	notetype 12, 1, 1
 	rest 16
 	octave 4

audio/music/credits.asm

@@ -1,4 +1,4 @@
-Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
+Music_Credits_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -284,7 +284,7 @@ Music_Credits_Ch1:: ; 7fc1f (1f:7c1f)
 	endchannel
 
 
-Music_Credits_Ch2:: ; 7fd5f (1f:7d5f)
+Music_Credits_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 5
@@ -574,7 +574,7 @@ Music_Credits_Ch2:: ; 7fd5f (1f:7d5f)
 	endchannel
 
 
-Music_Credits_Ch3:: ; 7fec2 (1f:7ec2)
+Music_Credits_Ch3::
 	notetype 12, 1, 0
 	octave 5
 	C# 6

audio/music/defeatedgymleader.asm

@@ -1,4 +1,4 @@
-Music_DefeatedGymLeader_Ch1:: ; 23cad (8:7cad)
+Music_DefeatedGymLeader_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -162,7 +162,7 @@ Music_DefeatedGymLeader_branch_23ccc::
 	loopchannel 0, Music_DefeatedGymLeader_branch_23ccc
 
 
-Music_DefeatedGymLeader_Ch2:: ; 23d6d (8:7d6d)
+Music_DefeatedGymLeader_Ch2::
 	duty 2
 	vibrato 24, 2, 4
 	notetype 12, 12, 4
@@ -352,7 +352,7 @@ Music_DefeatedGymLeader_branch_23d84::
 	loopchannel 0, Music_DefeatedGymLeader_branch_23d84
 
 
-Music_DefeatedGymLeader_Ch3:: ; 23e52 (8:7e52)
+Music_DefeatedGymLeader_Ch3::
 	notetype 12, 1, 0
 	vibrato 16, 1, 2
 	octave 4

audio/music/defeatedtrainer.asm

@@ -1,4 +1,4 @@
-Music_DefeatedTrainer_Ch1:: ; 23a53 (8:7a53)
+Music_DefeatedTrainer_Ch1::
 	tempo 224
 	volume 7, 7
 	duty 2
@@ -95,7 +95,7 @@ Music_DefeatedTrainer_branch_23a76::
 	loopchannel 0, Music_DefeatedTrainer_branch_23a76
 
 
-Music_DefeatedTrainer_Ch2:: ; 23ac1 (8:7ac1)
+Music_DefeatedTrainer_Ch2::
 	duty 2
 	notetype 4, 12, 3
 	octave 4
@@ -172,7 +172,7 @@ Music_DefeatedTrainer_branch_23ad2::
 	loopchannel 0, Music_DefeatedTrainer_branch_23ad2
 
 
-Music_DefeatedTrainer_Ch3:: ; 23b15 (8:7b15)
+Music_DefeatedTrainer_Ch3::
 	notetype 4, 1, 0
 	octave 5
 	D_ 2

audio/music/defeatedwildmon.asm

@@ -1,4 +1,4 @@
-Music_DefeatedWildMon_Ch1:: ; 23b74 (8:7b74)
+Music_DefeatedWildMon_Ch1::
 	tempo 112
 	volume 7, 7
 	executemusic
@@ -67,7 +67,7 @@ Music_DefeatedWildMon_branch_23b8b::
 	loopchannel 0, Music_DefeatedWildMon_branch_23b8b
 
 
-Music_DefeatedWildMon_Ch2:: ; 23bc1 (8:7bc1)
+Music_DefeatedWildMon_Ch2::
 	executemusic
 	duty 2
 	notetype 12, 12, 3
@@ -142,7 +142,7 @@ Music_DefeatedWildMon_branch_23bce::
 	loopchannel 0, Music_DefeatedWildMon_branch_23bce
 
 
-Music_DefeatedWildMon_Ch3:: ; 23c0e (8:7c0e)
+Music_DefeatedWildMon_Ch3::
 	executemusic
 	notetype 12, 2, 0
 	octave 5

audio/music/dungeon1.asm

@@ -1,4 +1,4 @@
-Music_Dungeon1_Ch1:: ; 7ded1 (1f:5ed1)
+Music_Dungeon1_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -226,7 +226,7 @@ Music_Dungeon1_branch_7dfd5::
 	endchannel
 
 
-Music_Dungeon1_Ch2:: ; 7dfde (1f:5fde)
+Music_Dungeon1_Ch2::
 	vibrato 11, 1, 5
 	duty 3
 	notetype 12, 0, 15
@@ -441,7 +441,7 @@ Music_Dungeon1_branch_7e0cd::
 	endchannel
 
 
-Music_Dungeon1_Ch3:: ; 7e0dc (1f:60dc)
+Music_Dungeon1_Ch3::
 	notetype 12, 1, 1
 	vibrato 8, 2, 6
 	rest 14
@@ -596,7 +596,7 @@ Music_Dungeon1_branch_7e177::
 	endchannel
 
 
-Music_Dungeon1_Ch4:: ; 7e18a (1f:618a)
+Music_Dungeon1_Ch4::
 	dspeed 12
 	rest 14
 	cymbal1 1

audio/music/dungeon2.asm

@@ -1,4 +1,4 @@
-Music_Dungeon2_Ch1:: ; 7e887 (1f:6887)
+Music_Dungeon2_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -70,7 +70,7 @@ Music_Dungeon2_branch_7e892::
 	loopchannel 0, Music_Dungeon2_branch_7e892
 
 
-Music_Dungeon2_Ch2:: ; 7e8d8 (1f:68d8)
+Music_Dungeon2_Ch2::
 	vibrato 11, 1, 5
 
 Music_Dungeon2_branch_7e8db::
@@ -162,7 +162,7 @@ Music_Dungeon2_branch_7e8db::
 	loopchannel 0, Music_Dungeon2_branch_7e8db
 
 
-Music_Dungeon2_Ch3:: ; 7e93b (1f:693b)
+Music_Dungeon2_Ch3::
 	notetype 12, 1, 3
 	vibrato 8, 2, 6
 
@@ -302,7 +302,7 @@ Music_Dungeon2_branch_7e9d1::
 	endchannel
 
 
-Music_Dungeon2_Ch4:: ; 7e9dc (1f:69dc)
+Music_Dungeon2_Ch4::
 	dspeed 12
 
 Music_Dungeon2_branch_7e9dd::

audio/music/dungeon3.asm

@@ -1,4 +1,4 @@
-Music_Dungeon3_Ch1:: ; 7e9f1 (1f:69f1)
+Music_Dungeon3_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -335,7 +335,7 @@ Music_Dungeon3_branch_7eafc::
 	endchannel
 
 
-Music_Dungeon3_Ch2:: ; 7eb68 (1f:6b68)
+Music_Dungeon3_Ch2::
 	vibrato 11, 1, 5
 	duty 3
 
@@ -607,7 +607,7 @@ Music_Dungeon3_branch_7eb6d::
 	loopchannel 0, Music_Dungeon3_branch_7eb6d
 
 
-Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a)
+Music_Dungeon3_Ch3::
 	notetype 12, 1, 2
 	rest 16
 	rest 16
@@ -710,7 +710,7 @@ Music_Dungeon3_Ch3:: ; 7ec7a (1f:6c7a)
 	loopchannel 0, Music_Dungeon3_Ch3
 
 
-Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
+Music_Dungeon3_Ch4::
 	dspeed 12
 	rest 16
 	rest 16

audio/music/finalbattle.asm

@@ -1,4 +1,4 @@
-Music_FinalBattle_Ch1:: ; 233a6 (8:73a6)
+Music_FinalBattle_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -381,7 +381,7 @@ Music_FinalBattle_branch_23429::
 	loopchannel 0, Music_FinalBattle_branch_23429
 
 
-Music_FinalBattle_Ch2:: ; 2356a (8:756a)
+Music_FinalBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -738,7 +738,7 @@ Music_FinalBattle_branch_23710::
 	endchannel
 
 
-Music_FinalBattle_Ch3:: ; 2371c (8:771c)
+Music_FinalBattle_Ch3::
 	notetype 12, 1, 1
 	octave 4
 	E_ 4

audio/music/gamecorner.asm

@@ -1,4 +1,4 @@
-Music_GameCorner_Ch1:: ; 7e20b (1f:620b)
+Music_GameCorner_Ch1::
 	tempo 120
 	volume 7, 7
 	duty 3
@@ -183,7 +183,7 @@ Music_GameCorner_branch_7e222::
 	loopchannel 0, Music_GameCorner_branch_7e222
 
 
-Music_GameCorner_Ch2:: ; 7e2df (1f:62df)
+Music_GameCorner_Ch2::
 	duty 2
 	vibrato 10, 2, 3
 	notetype 12, 12, 6
@@ -343,7 +343,7 @@ Music_GameCorner_branch_7e2fa::
 	loopchannel 0, Music_GameCorner_branch_7e2fa
 
 
-Music_GameCorner_Ch3:: ; 7e38b (1f:638b)
+Music_GameCorner_Ch3::
 	notetype 12, 1, 3
 	octave 5
 	C# 1

audio/music/gym.asm

@@ -1,4 +1,4 @@
-Music_Gym_Ch1:: ; bcbb (2:7cbb)
+Music_Gym_Ch1::
 	tempo 138
 	volume 7, 7
 	duty 3
@@ -165,7 +165,7 @@ Music_Gym_branch_bcd8::
 	loopchannel 0, Music_Gym_branch_bcd8
 
 
-Music_Gym_Ch2:: ; bd6b (2:7d6b)
+Music_Gym_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 7
@@ -288,7 +288,7 @@ Music_Gym_branch_bd82::
 	loopchannel 0, Music_Gym_branch_bd82
 
 
-Music_Gym_Ch3:: ; bdfa (2:7dfa)
+Music_Gym_Ch3::
 	notetype 12, 1, 1
 	rest 16
 	rest 10

audio/music/gymleaderbattle.asm

@@ -1,4 +1,4 @@
-Music_GymLeaderBattle_Ch1:: ; 22370 (8:6370)
+Music_GymLeaderBattle_Ch1::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -547,7 +547,7 @@ Music_GymLeaderBattle_branch_223b0::
 	loopchannel 0, Music_GymLeaderBattle_branch_223b0
 
 
-Music_GymLeaderBattle_Ch2:: ; 225a1 (8:65a1)
+Music_GymLeaderBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -848,7 +848,7 @@ Music_GymLeaderBattle_branch_225e0::
 	loopchannel 0, Music_GymLeaderBattle_branch_225e0
 
 
-Music_GymLeaderBattle_Ch3:: ; 226ef (8:66ef)
+Music_GymLeaderBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 3
 	rest 12

audio/music/halloffame.asm

@@ -1,4 +1,4 @@
-Music_HallOfFame_Ch1:: ; 7fbaf (1f:7baf)
+Music_HallOfFame_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -31,7 +31,7 @@ Music_HallOfFame_branch_7fbc5::
 	loopchannel 0, Music_HallOfFame_branch_7fbc5
 
 
-Music_HallOfFame_Ch2:: ; 7fbda (1f:7bda)
+Music_HallOfFame_Ch2::
 	vibrato 8, 2, 5
 	duty 3
 
@@ -63,7 +63,7 @@ Music_HallOfFame_branch_7fbdf::
 	loopchannel 0, Music_HallOfFame_branch_7fbdf
 
 
-Music_HallOfFame_Ch3:: ; 7fbfc (1f:7bfc)
+Music_HallOfFame_Ch3::
 	notetype 12, 1, 2
 
 Music_HallOfFame_branch_7fbfe::

audio/music/indigoplateau.asm

@@ -1,4 +1,4 @@
-Music_IndigoPlateau_Ch1:: ; a5f0 (2:65f0)
+Music_IndigoPlateau_Ch1::
 	tempo 132
 	volume 7, 7
 	duty 3
@@ -86,7 +86,7 @@ Music_IndigoPlateau_branch_a659::
 	endchannel
 
 
-Music_IndigoPlateau_Ch2:: ; a664 (2:6664)
+Music_IndigoPlateau_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -147,7 +147,7 @@ Music_IndigoPlateau_branch_a6af::
 	endchannel
 
 
-Music_IndigoPlateau_Ch3:: ; a6ba (2:66ba)
+Music_IndigoPlateau_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	D_ 2
@@ -225,7 +225,7 @@ Music_IndigoPlateau_branch_a6fe::
 	endchannel
 
 
-Music_IndigoPlateau_Ch4:: ; a70f (2:670f)
+Music_IndigoPlateau_Ch4::
 	dspeed 6
 	mutedsnare2 16
 	mutedsnare2 16

audio/music/introbattle.asm

@@ -1,4 +1,4 @@
-Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
+Music_IntroBattle_Ch1::
 	tempo 98
 	volume 7, 7
 	duty 3
@@ -90,7 +90,7 @@ Music_IntroBattle_Ch1:: ; 7f844 (1f:7844)
 	endchannel
 
 
-Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc)
+Music_IntroBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 2
@@ -165,7 +165,7 @@ Music_IntroBattle_Ch2:: ; 7f8bc (1f:78bc)
 	endchannel
 
 
-Music_IntroBattle_Ch3:: ; 7f91d (1f:791d)
+Music_IntroBattle_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 4
@@ -229,7 +229,7 @@ Music_IntroBattle_Ch3:: ; 7f91d (1f:791d)
 	endchannel
 
 
-Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
+Music_IntroBattle_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1

audio/music/jigglypuffsong.asm

@@ -1,4 +1,4 @@
-Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
+Music_JigglypuffSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 8, 2, 4
@@ -21,7 +21,7 @@ Music_JigglypuffSong_Ch1:: ; 7fb7d (1f:7b7d)
 	endchannel
 
 
-Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
+Music_JigglypuffSong_Ch2::
 	vibrato 5, 1, 5
 	duty 2
 	dutycycle 10

audio/music/lavender.asm

@@ -1,4 +1,4 @@
-Music_Lavender_Ch1:: ; bb58 (2:7b58)
+Music_Lavender_Ch1::
 	tempo 152
 	volume 7, 7
 	duty 1
@@ -62,7 +62,7 @@ Music_Lavender_branch_bb6b::
 	loopchannel 0, Music_Lavender_branch_bb6b
 
 
-Music_Lavender_Ch2:: ; bb9e (2:7b9e)
+Music_Lavender_Ch2::
 	vibrato 0, 3, 4
 	duty 3
 	notetype 12, 9, 1
@@ -76,7 +76,7 @@ Music_Lavender_branch_bba5::
 	loopchannel 0, Music_Lavender_branch_bba5
 
 
-Music_Lavender_Ch3:: ; bbae (2:7bae)
+Music_Lavender_Ch3::
 	vibrato 4, 1, 1
 	notetype 12, 3, 5
 	rest 16
@@ -186,7 +186,7 @@ Music_Lavender_branch_bbb9::
 	loopchannel 0, Music_Lavender_branch_bbb9
 
 
-Music_Lavender_Ch4:: ; bc21 (2:7c21)
+Music_Lavender_Ch4::
 	dspeed 12
 	rest 16
 	rest 16

audio/music/meeteviltrainer.asm

@@ -1,4 +1,4 @@
-Music_MeetEvilTrainer_Ch1:: ; 7f69d (1f:769d)
+Music_MeetEvilTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty 2
@@ -21,7 +21,7 @@ Music_MeetEvilTrainer_branch_7f6ae::
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6ae
 
 
-Music_MeetEvilTrainer_Ch2:: ; 7f6ba (1f:76ba)
+Music_MeetEvilTrainer_Ch2::
 	duty 1
 	notetype 12, 11, 6
 	octave 3
@@ -60,7 +60,7 @@ Music_MeetEvilTrainer_branch_7f6c2::
 	loopchannel 0, Music_MeetEvilTrainer_branch_7f6c2
 
 
-Music_MeetEvilTrainer_Ch3:: ; 7f6e6 (1f:76e6)
+Music_MeetEvilTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 4

audio/music/meetfemaletrainer.asm

@@ -1,4 +1,4 @@
-Music_MeetFemaleTrainer_Ch1:: ; 7f6f9 (1f:76f9)
+Music_MeetFemaleTrainer_Ch1::
 	tempo 124
 	volume 7, 7
 	duty 1
@@ -26,7 +26,7 @@ Music_MeetFemaleTrainer_branch_7f70c::
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f70c
 
 
-Music_MeetFemaleTrainer_Ch2:: ; 7f71c (1f:771c)
+Music_MeetFemaleTrainer_Ch2::
 	duty 2
 	notetype 12, 12, 2
 	octave 3
@@ -71,7 +71,7 @@ Music_MeetFemaleTrainer_branch_7f726::
 	loopchannel 0, Music_MeetFemaleTrainer_branch_7f726
 
 
-Music_MeetFemaleTrainer_Ch3:: ; 7f74b (1f:774b)
+Music_MeetFemaleTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 8
 	octave 5

audio/music/meetmaletrainer.asm

@@ -1,4 +1,4 @@
-Music_MeetMaleTrainer_Ch1:: ; 7f77b (1f:777b)
+Music_MeetMaleTrainer_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -32,7 +32,7 @@ Music_MeetMaleTrainer_branch_7f78f::
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f78f
 
 
-Music_MeetMaleTrainer_Ch2:: ; 7f7a2 (1f:77a2)
+Music_MeetMaleTrainer_Ch2::
 	duty 3
 	vibrato 24, 2, 2
 	notetype 12, 12, 4
@@ -75,7 +75,7 @@ Music_MeetMaleTrainer_branch_7f7b5::
 	loopchannel 0, Music_MeetMaleTrainer_branch_7f7b5
 
 
-Music_MeetMaleTrainer_Ch3:: ; 7f7d2 (1f:77d2)
+Music_MeetMaleTrainer_Ch3::
 	notetype 12, 1, 0
 	rest 6
 	octave 4

audio/music/meetprofoak.asm

@@ -1,4 +1,4 @@
-Music_MeetProfOak_Ch1:: ; af59 (2:6f59)
+Music_MeetProfOak_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -74,7 +74,7 @@ Music_MeetProfOak_branch_af85::
 	loopchannel 0, Music_MeetProfOak_branch_af85
 
 
-Music_MeetProfOak_Ch2:: ; afa9 (2:6fa9)
+Music_MeetProfOak_Ch2::
 	vibrato 8, 1, 1
 	duty 2
 	notetype 12, 12, 4
@@ -208,7 +208,7 @@ Music_MeetProfOak_branch_b005::
 	loopchannel 0, Music_MeetProfOak_branch_b005
 
 
-Music_MeetProfOak_Ch3:: ; b03d (2:703d)
+Music_MeetProfOak_Ch3::
 	notetype 12, 1, 2
 	rest 10
 	octave 4

audio/music/meetrival.asm

@@ -2,7 +2,7 @@ Music_MeetRival_branch_b119::
 	tempo 100
 	loopchannel 0, Music_MeetRival_branch_b123
 
-Music_MeetRival_Ch1:: ; b120 (2:7120)
+Music_MeetRival_Ch1::
 	tempo 112
 
 Music_MeetRival_branch_b123::
@@ -143,7 +143,7 @@ Music_MeetRival_branch_b1a5::
 	loopchannel 0, Music_MeetRival_branch_b140
 
 
-Music_MeetRival_Ch2:: ; b1bb (2:71bb)
+Music_MeetRival_Ch2::
 	duty 3
 	vibrato 10, 2, 6
 	notetype 12, 12, 7
@@ -248,7 +248,7 @@ Music_MeetRival_branch_b21d::
 	loopchannel 0, Music_MeetRival_branch_b1d8
 
 
-Music_MeetRival_Ch3:: ; b233 (2:7233)
+Music_MeetRival_Ch3::
 	notetype 12, 1, 4
 	octave 5
 	D_ 2

audio/music/museumguy.asm

@@ -1,4 +1,4 @@
-Music_MuseumGuy_Ch1:: ; adae (2:6dae)
+Music_MuseumGuy_Ch1::
 	tempo 128
 	volume 7, 7
 	duty 2
@@ -54,7 +54,7 @@ Music_MuseumGuy_branch_adec::
 	endchannel
 
 
-Music_MuseumGuy_Ch2:: ; adf1 (2:6df1)
+Music_MuseumGuy_Ch2::
 	duty 2
 	notetype 12, 12, 1
 	octave 4
@@ -165,7 +165,7 @@ Music_MuseumGuy_branch_ae26::
 	loopchannel 0, Music_MuseumGuy_branch_ae26
 
 
-Music_MuseumGuy_Ch3:: ; ae6e (2:6e6e)
+Music_MuseumGuy_Ch3::
 	notetype 12, 1, 0
 	rest 16
 	octave 4
@@ -261,7 +261,7 @@ Music_MuseumGuy_branch_aec1::
 	endchannel
 
 
-Music_MuseumGuy_Ch4:: ; aed1 (2:6ed1)
+Music_MuseumGuy_Ch4::
 	dspeed 12
 	rest 16
 	rest 16

audio/music/oakslab.asm

@@ -1,4 +1,4 @@
-Music_OaksLab_Ch1:: ; 7eeb9 (1f:6eb9)
+Music_OaksLab_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -69,7 +69,7 @@ Music_OaksLab_branch_7eed0::
 	loopchannel 0, Music_OaksLab_branch_7eed0
 
 
-Music_OaksLab_Ch2:: ; 7ef05 (1f:6f05)
+Music_OaksLab_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 4
@@ -144,7 +144,7 @@ Music_OaksLab_branch_7ef16::
 	loopchannel 0, Music_OaksLab_branch_7ef16
 
 
-Music_OaksLab_Ch3:: ; 7ef52 (1f:6f52)
+Music_OaksLab_Ch3::
 	notetype 12, 1, 1
 	rest 2
 	octave 4

audio/music/pallettown.asm

@@ -1,4 +1,4 @@
-Music_PalletTown_Ch1:: ; a7c5 (2:67c5)
+Music_PalletTown_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 2
@@ -148,7 +148,7 @@ Music_PalletTown_branch_a7ce::
 	endchannel
 
 
-Music_PalletTown_Ch2:: ; a85f (2:685f)
+Music_PalletTown_Ch2::
 	duty 2
 
 Music_PalletTown_branch_a861::
@@ -262,7 +262,7 @@ Music_PalletTown_branch_a861::
 	endchannel
 
 
-Music_PalletTown_Ch3:: ; a8de (2:68de)
+Music_PalletTown_Ch3::
 	vibrato 24, 2, 8
 	notetype 12, 1, 2
 

audio/music/pkmnhealed.asm

@@ -1,4 +1,4 @@
-Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
+Music_PkmnHealed_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 2
@@ -19,7 +19,7 @@ Music_PkmnHealed_Ch1:: ; 9ba3 (2:5ba3)
 	endchannel
 
 
-Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4)
+Music_PkmnHealed_Ch2::
 	duty 2
 	notetype 12, 12, 3
 	octave 4
@@ -33,7 +33,7 @@ Music_PkmnHealed_Ch2:: ; 9bc4 (2:5bc4)
 	endchannel
 
 
-Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
+Music_PkmnHealed_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 2

audio/music/pokecenter.asm

@@ -1,4 +1,4 @@
-Music_Pokecenter_Ch1:: ; be56 (2:7e56)
+Music_Pokecenter_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -149,7 +149,7 @@ Music_Pokecenter_branch_be61::
 	loopchannel 0, Music_Pokecenter_branch_be61
 
 
-Music_Pokecenter_Ch2:: ; bef9 (2:7ef9)
+Music_Pokecenter_Ch2::
 	vibrato 8, 2, 5
 
 Music_Pokecenter_branch_befc::
@@ -248,7 +248,7 @@ Music_Pokecenter_branch_bf60::
 	endchannel
 
 
-Music_Pokecenter_Ch3:: ; bf70 (2:7f70)
+Music_Pokecenter_Ch3::
 	notetype 12, 1, 0
 
 Music_Pokecenter_branch_bf72::

audio/music/pokemontower.asm

@@ -1,4 +1,4 @@
-Music_PokemonTower_Ch1:: ; 7f04a (1f:704a)
+Music_PokemonTower_Ch1::
 	tempo 152
 	volume 7, 7
 	duty 3
@@ -140,7 +140,7 @@ Music_PokemonTower_branch_7f05a::
 	loopchannel 0, Music_PokemonTower_branch_7f05a
 
 
-Music_PokemonTower_Ch2:: ; 7f0e3 (1f:70e3)
+Music_PokemonTower_Ch2::
 	vibrato 20, 3, 4
 	duty 3
 	notetype 12, 10, 0
@@ -292,7 +292,7 @@ Music_PokemonTower_branch_7f0ee::
 	loopchannel 0, Music_PokemonTower_branch_7f0ee
 
 
-Music_PokemonTower_Ch3:: ; 7f19a (1f:719a)
+Music_PokemonTower_Ch3::
 	vibrato 4, 1, 1
 	notetype 12, 1, 3
 	rest 8

audio/music/routes1.asm

@@ -1,4 +1,4 @@
-Music_Routes1_Ch1:: ; 9bde (2:5bde)
+Music_Routes1_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 4, 2, 3
@@ -106,7 +106,7 @@ Music_Routes1_branch_9be9::
 	endchannel
 
 
-Music_Routes1_Ch2:: ; 9c51 (2:5c51)
+Music_Routes1_Ch2::
 	duty 2
 
 Music_Routes1_branch_9c53::
@@ -234,7 +234,7 @@ Music_Routes1_branch_9c8d::
 	endchannel
 
 
-Music_Routes1_Ch3:: ; 9cd8 (2:5cd8)
+Music_Routes1_Ch3::
 	vibrato 8, 2, 5
 	notetype 12, 1, 3
 
@@ -309,7 +309,7 @@ Music_Routes1_branch_9cdd::
 	endchannel
 
 
-Music_Routes1_Ch4:: ; 9d24 (2:5d24)
+Music_Routes1_Ch4::
 	dspeed 12
 	rest 4
 	mutedsnare1 2

audio/music/routes2.asm

@@ -1,4 +1,4 @@
-Music_Routes2_Ch1:: ; 9db9 (2:5db9)
+Music_Routes2_Ch1::
 	tempo 152
 	volume 7, 7
 	vibrato 9, 2, 5
@@ -142,7 +142,7 @@ Music_Routes2_branch_9dc3::
 	endchannel
 
 
-Music_Routes2_Ch2:: ; 9e4f (2:5e4f)
+Music_Routes2_Ch2::
 	vibrato 8, 2, 6
 	duty 3
 
@@ -216,7 +216,7 @@ Music_Routes2_branch_9e54::
 	endchannel
 
 
-Music_Routes2_Ch3:: ; 9e9b (2:5e9b)
+Music_Routes2_Ch3::
 	vibrato 9, 2, 8
 
 Music_Routes2_branch_9e9e::
@@ -324,7 +324,7 @@ Music_Routes2_branch_9e9e::
 	endchannel
 
 
-Music_Routes2_Ch4:: ; 9f08 (2:5f08)
+Music_Routes2_Ch4::
 	dspeed 12
 	snare3 2
 	rest 2

audio/music/routes3.asm

@@ -1,4 +1,4 @@
-Music_Routes3_Ch1:: ; 9fad (2:5fad)
+Music_Routes3_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -77,7 +77,7 @@ Music_Routes3_branch_9fc3::
 	loopchannel 0, Music_Routes3_branch_9fc3
 
 
-Music_Routes3_Ch2:: ; a009 (2:6009)
+Music_Routes3_Ch2::
 	vibrato 8, 2, 3
 	duty 2
 	notetype 12, 12, 7
@@ -178,7 +178,7 @@ Music_Routes3_branch_a01a::
 	loopchannel 0, Music_Routes3_branch_a01a
 
 
-Music_Routes3_Ch3:: ; a07f (2:607f)
+Music_Routes3_Ch3::
 	vibrato 4, 1, 0
 	notetype 6, 1, 2
 	octave 4
@@ -354,7 +354,7 @@ Music_Routes3_branch_a0a3::
 	loopchannel 0, Music_Routes3_branch_a0a3
 
 
-Music_Routes3_Ch4:: ; a131 (2:6131)
+Music_Routes3_Ch4::
 	dspeed 6
 	mutedsnare4 1
 	mutedsnare4 1

audio/music/routes4.asm

@@ -1,4 +1,4 @@
-Music_Routes4_Ch1:: ; a26a (2:626a)
+Music_Routes4_Ch1::
 	tempo 148
 	volume 7, 7
 	duty 3
@@ -138,7 +138,7 @@ Music_Routes4_branch_a28a::
 	loopchannel 0, Music_Routes4_branch_a28a
 
 
-Music_Routes4_Ch2:: ; a304 (2:6304)
+Music_Routes4_Ch2::
 	vibrato 12, 2, 4
 	duty 1
 	notetype 12, 9, 2
@@ -288,7 +288,7 @@ Music_Routes4_branch_a325::
 	loopchannel 0, Music_Routes4_branch_a325
 
 
-Music_Routes4_Ch3:: ; a3c4 (2:63c4)
+Music_Routes4_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 1
@@ -506,7 +506,7 @@ Music_Routes4_branch_a3d7::
 	loopchannel 0, Music_Routes4_branch_a3d7
 
 
-Music_Routes4_Ch4:: ; a49d (2:649d)
+Music_Routes4_Ch4::
 	dspeed 12
 	rest 16
 	rest 12

audio/music/safarizone.asm

@@ -1,4 +1,4 @@
-Music_SafariZone_Ch1:: ; bc2e (2:7c2e)
+Music_SafariZone_Ch1::
 	tempo 132
 	volume 7, 7
 	vibrato 6, 3, 4
@@ -39,7 +39,7 @@ Music_SafariZone_branch_bc5f::
 	endchannel
 
 
-Music_SafariZone_Ch2:: ; bc6a (2:7c6a)
+Music_SafariZone_Ch2::
 	duty 2
 	vibrato 8, 2, 5
 	notetype 12, 10, 2
@@ -73,7 +73,7 @@ Music_SafariZone_branch_bc89::
 	endchannel
 
 
-Music_SafariZone_Ch3:: ; bc94 (2:7c94)
+Music_SafariZone_Ch3::
 	notetype 12, 1, 0
 	rest 8
 

audio/music/silphco.asm

@@ -1,4 +1,4 @@
-Music_SilphCo_Ch1:: ; 7f243 (1f:7243)
+Music_SilphCo_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -395,7 +395,7 @@ Music_SilphCo_branch_7f3f0::
 	endchannel
 
 
-Music_SilphCo_Ch2:: ; 7f409 (1f:7409)
+Music_SilphCo_Ch2::
 	vibrato 10, 3, 2
 	duty 3
 	notetype 6, 12, 3
@@ -780,7 +780,7 @@ Music_SilphCo_branch_7f42e::
 	loopchannel 0, Music_SilphCo_branch_7f42e
 
 
-Music_SilphCo_Ch3:: ; 7f5be (1f:75be)
+Music_SilphCo_Ch3::
 	vibrato 8, 1, 1
 	notetype 12, 1, 1
 	rest 12

audio/music/ssanne.asm

@@ -1,4 +1,4 @@
-Music_SSAnne_Ch1:: ; b3a7 (2:73a7)
+Music_SSAnne_Ch1::
 	tempo 128
 	volume 7, 7
 	duty 1
@@ -107,7 +107,7 @@ Music_SSAnne_branch_b3b2::
 	loopchannel 0, Music_SSAnne_branch_b3b2
 
 
-Music_SSAnne_Ch2:: ; b419 (2:7419)
+Music_SSAnne_Ch2::
 	duty 0
 	vibrato 12, 2, 4
 
@@ -282,7 +282,7 @@ Music_SSAnne_branch_b41e::
 	loopchannel 0, Music_SSAnne_branch_b41e
 
 
-Music_SSAnne_Ch3:: ; b4cb (2:74cb)
+Music_SSAnne_Ch3::
 	notetype 12, 1, 3
 	rest 16
 	rest 12

audio/music/surfing.asm

@@ -1,4 +1,4 @@
-Music_Surfing_Ch1:: ; 7fa19 (1f:7a19)
+Music_Surfing_Ch1::
 	tempo 160
 	volume 7, 7
 	duty 3
@@ -116,7 +116,7 @@ Music_Surfing_branch_7fa30::
 	loopchannel 0, Music_Surfing_branch_7fa30
 
 
-Music_Surfing_Ch2:: ; 7fa9c (1f:7a9c)
+Music_Surfing_Ch2::
 	duty 3
 	vibrato 16, 2, 5
 	notetype 12, 12, 6
@@ -203,7 +203,7 @@ Music_Surfing_branch_7faae::
 	loopchannel 0, Music_Surfing_branch_7faae
 
 
-Music_Surfing_Ch3:: ; 7fafa (1f:7afa)
+Music_Surfing_Ch3::
 	notetype 12, 1, 0
 	rest 12
 	octave 5

audio/music/titlescreen.asm

@@ -1,4 +1,4 @@
-Music_TitleScreen_Ch1:: ; 7e4c0 (1f:64c0)
+Music_TitleScreen_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 9, 3, 4
@@ -154,7 +154,7 @@ Music_TitleScreen_branch_7e55c::
 	endchannel
 
 
-Music_TitleScreen_Ch2:: ; 7e578 (1f:6578)
+Music_TitleScreen_Ch2::
 	vibrato 16, 4, 6
 	duty 1
 	notetype 12, 14, 1
@@ -321,7 +321,7 @@ Music_TitleScreen_branch_7e636::
 	endchannel
 
 
-Music_TitleScreen_Ch3:: ; 7e643 (1f:6643)
+Music_TitleScreen_Ch3::
 	notetype 12, 1, 0
 	octave 3
 	G_ 1
@@ -459,7 +459,7 @@ Music_TitleScreen_branch_7e6e5::
 	endchannel
 
 
-Music_TitleScreen_Ch4:: ; 7e6eb (1f:66eb)
+Music_TitleScreen_Ch4::
 	dspeed 6
 	rest 4
 	snare3 1

audio/music/trainerbattle.asm

@@ -1,4 +1,4 @@
-Music_TrainerBattle_Ch1:: ; 22919 (8:6919)
+Music_TrainerBattle_Ch1::
 	tempo 112
 	volume 7, 7
 	duty 3
@@ -649,7 +649,7 @@ Music_TrainerBattle_branch_22962::
 	loopchannel 0, Music_TrainerBattle_branch_22962
 
 
-Music_TrainerBattle_Ch2:: ; 22bae (8:6bae)
+Music_TrainerBattle_Ch2::
 	duty 3
 	vibrato 10, 2, 5
 	notetype 12, 12, 2
@@ -953,7 +953,7 @@ Music_TrainerBattle_branch_22bfc::
 	loopchannel 0, Music_TrainerBattle_branch_22bfc
 
 
-Music_TrainerBattle_Ch3:: ; 22d10 (8:6d10)
+Music_TrainerBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 4
 	octave 3

audio/music/unusedsong.asm

@@ -1,4 +1,4 @@
-Music_UnusedSong_Ch1:: ; a913 (2:6913)
+Music_UnusedSong_Ch1::
 	tempo 144
 	volume 7, 7
 	vibrato 5, 1, 6
@@ -182,7 +182,7 @@ Music_UnusedSong_branch_a91b::
 	endchannel
 
 
-Music_UnusedSong_Ch2:: ; a9cf (2:69cf)
+Music_UnusedSong_Ch2::
 	tempo 144
 	volume 7, 7
 	toggleperfectpitch

audio/music/vermilion.asm

@@ -1,4 +1,4 @@
-Music_Vermilion_Ch1:: ; b9eb (2:79eb)
+Music_Vermilion_Ch1::
 	tempo 156
 	volume 7, 7
 	duty 3
@@ -111,7 +111,7 @@ Music_Vermilion_branch_b9f6::
 	loopchannel 0, Music_Vermilion_branch_b9f6
 
 
-Music_Vermilion_Ch2:: ; ba61 (2:7a61)
+Music_Vermilion_Ch2::
 	duty 3
 	vibrato 10, 2, 3
 
@@ -178,7 +178,7 @@ Music_Vermilion_branch_ba66::
 	loopchannel 0, Music_Vermilion_branch_ba66
 
 
-Music_Vermilion_Ch3:: ; baa6 (2:7aa6)
+Music_Vermilion_Ch3::
 	notetype 12, 1, 0
 
 Music_Vermilion_branch_baa8::
@@ -282,7 +282,7 @@ Music_Vermilion_branch_baa8::
 	loopchannel 0, Music_Vermilion_branch_baa8
 
 
-Music_Vermilion_Ch4:: ; bb0d (2:7b0d)
+Music_Vermilion_Ch4::
 	dspeed 12
 
 Music_Vermilion_branch_bb0e::

audio/music/wildbattle.asm

@@ -1,4 +1,4 @@
-Music_WildBattle_Ch1:: ; 23099 (8:7099)
+Music_WildBattle_Ch1::
 	tempo 104
 	volume 7, 7
 	duty 3
@@ -300,7 +300,7 @@ Music_WildBattle_branch_230e0::
 	loopchannel 0, Music_WildBattle_branch_230e0
 
 
-Music_WildBattle_Ch2:: ; 231d8 (8:71d8)
+Music_WildBattle_Ch2::
 	duty 3
 	vibrato 8, 2, 5
 	notetype 12, 12, 3
@@ -462,7 +462,7 @@ Music_WildBattle_branch_23225::
 	loopchannel 0, Music_WildBattle_branch_23225
 
 
-Music_WildBattle_Ch3:: ; 23290 (8:7290)
+Music_WildBattle_Ch3::
 	vibrato 0, 2, 0
 	notetype 12, 1, 1
 	octave 4

audio/music/yellow/meetjessiejames.asm

@@ -1,4 +1,4 @@
-Music_MeetJessieJames_Ch1:: ; 8316d (20:716d)
+Music_MeetJessieJames_Ch1::
 	tempo 144
 	volume 7, 7
 	duty 3
@@ -77,7 +77,7 @@ Music_MeetJessieJames_branch_83187::
 	loopchannel 0, Music_MeetJessieJames_branch_83187
 
 
-Music_MeetJessieJames_Ch2:: ; 831c8 (20:71c8)
+Music_MeetJessieJames_Ch2::
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -164,7 +164,7 @@ Music_MeetJessieJames_branch_831df::
 	loopchannel 0, Music_MeetJessieJames_branch_831df
 
 
-Music_MeetJessieJames_Ch3:: ; 8322a (20:722a)
+Music_MeetJessieJames_Ch3::
 	notetype 12, 1, 0
 	rest 16
 	rest 8

audio/music/yellow/surfingpikachu.asm

@@ -1,4 +1,4 @@
-Music_SurfingPikachu_Ch1:: ; 82ce8 (20:6ce8)
+Music_SurfingPikachu_Ch1::
 	tempo 117
 	volume 7, 7
 	duty 3
@@ -162,7 +162,7 @@ Music_SurfingPikachu_branch_82d1a::
 	loopchannel 0, Music_SurfingPikachu_branch_82d1a
 
 
-Music_SurfingPikachu_Ch2:: ; 82d9d (20:6d9d)
+Music_SurfingPikachu_Ch2::
 	duty 3
 	vibrato 6, 1, 5
 	notetype 12, 12, 4
@@ -312,7 +312,7 @@ Music_SurfingPikachu_branch_82de0::
 	loopchannel 0, Music_SurfingPikachu_branch_82de0
 
 
-Music_SurfingPikachu_Ch3:: ; 82e45 (20:6e45)
+Music_SurfingPikachu_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	B_ 6

audio/music/yellow/yellowintro.asm

@@ -1,4 +1,4 @@
-Music_YellowIntro_Ch1:: ; 7f65c (1f:765c)
+Music_YellowIntro_Ch1::
 	tempo 116
 	volume 7, 7
 	duty 3
@@ -100,7 +100,7 @@ Music_YellowIntro_Ch1:: ; 7f65c (1f:765c)
 	endchannel
 
 
-Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3)
+Music_YellowIntro_Ch2::
 	duty 2
 	vibrato 6, 1, 5
 	notetype 12, 12, 2
@@ -203,7 +203,7 @@ Music_YellowIntro_Ch2:: ; 7f6d3 (1f:76d3)
 	endchannel
 
 
-Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
+Music_YellowIntro_Ch3::
 	notetype 12, 1, 0
 	octave 4
 	E_ 1

audio/music/yellow/yellowunusedsong.asm

@@ -1,4 +1,4 @@
-Music_YellowUnusedSong_Ch1:: ; 82fbe (20:6fbe)
+Music_YellowUnusedSong_Ch1::
 	tempo 140
 	volume 7, 7
 	duty 3
@@ -75,7 +75,7 @@ Music_YellowUnusedSong_branch_82fde::
 	loopchannel 0, Music_YellowUnusedSong_branch_82fde
 
 
-Music_YellowUnusedSong_Ch2:: ; 83010 (20:7010)
+Music_YellowUnusedSong_Ch2::
 	duty 2
 	notetype 8, 12, 2
 	octave 4
@@ -161,7 +161,7 @@ Music_YellowUnusedSong_branch_8302a::
 	loopchannel 0, Music_YellowUnusedSong_branch_8302a
 
 
-Music_YellowUnusedSong_Ch3:: ; 83068 (20:7068)
+Music_YellowUnusedSong_Ch3::
 	notetype 12, 1, 0
 	vibrato 2, 1, 5
 	rest 16
@@ -202,7 +202,7 @@ Music_YellowUnusedSong_branch_83075::
 	loopchannel 0, Music_YellowUnusedSong_branch_83075
 
 
-Music_YellowUnusedSong_Ch4:: ; 83092 (20:7092)
+Music_YellowUnusedSong_Ch4::
 	dspeed 12
 	snare3 4
 	dspeed 8

audio/sfx/59_1.asm

@@ -1,10 +1,10 @@
-SFX_59_1_Ch1: ; 841b (2:441b)
+SFX_59_1_Ch1:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_1_Ch2: ; 8422 (2:4422)
+SFX_59_1_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7

audio/sfx/59_3.asm

@@ -1,10 +1,10 @@
-SFX_59_3_Ch1: ; 7c404 (1f:4404)
+SFX_59_3_Ch1:
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_59_3_Ch2: ; 7c40b (1f:440b)
+SFX_59_3_Ch2:
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7

audio/sfx/arrow_tiles_1.asm

@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
+SFX_Arrow_Tiles_1_Ch1:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7

audio/sfx/arrow_tiles_3.asm

@@ -1,4 +1,4 @@
-SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
+SFX_Arrow_Tiles_3_Ch1:
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7

audio/sfx/ball_poof.asm

@@ -1,4 +1,4 @@
-SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
+SFX_Ball_Poof_Ch1:
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,6 +6,6 @@ SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
 	endchannel
 
 
-SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
+SFX_Ball_Poof_Ch2:
 	unknownnoise0x20 15, 162, 34
 	endchannel

audio/sfx/ball_toss.asm

@@ -1,11 +1,11 @@
-SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
+SFX_Ball_Toss_Ch1:
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
 	endchannel
 
 
-SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
+SFX_Ball_Toss_Ch2:
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel

audio/sfx/battle_09.asm

@@ -1,4 +1,4 @@
-SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
+SFX_Battle_09_Ch1:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5

audio/sfx/battle_0b.asm

@@ -1,3 +1,3 @@
-SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
+SFX_Battle_0B_Ch1:
 	unknownnoise0x20 8, 241, 84
 	endchannel

audio/sfx/battle_0c.asm

@@ -1,4 +1,4 @@
-SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
+SFX_Battle_0C_Ch1:
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85

audio/sfx/battle_0d.asm

@@ -1,4 +1,4 @@
-SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
+SFX_Battle_0D_Ch1:
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85

audio/sfx/battle_0e.asm

@@ -1,4 +1,4 @@
-SFX_Battle_0E_Ch1: ; 204e0 (8:44e0)
+SFX_Battle_0E_Ch1:
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel

audio/sfx/battle_0f.asm

@@ -1,4 +1,4 @@
-SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
+SFX_Battle_0F_Ch1:
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58

audio/sfx/battle_12.asm

@@ -1,4 +1,4 @@
-SFX_Battle_12_Ch1: ; 2050b (8:450b)
+SFX_Battle_12_Ch1:
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35

audio/sfx/battle_13.asm

@@ -1,4 +1,4 @@
-SFX_Battle_13_Ch1: ; 20519 (8:4519)
+SFX_Battle_13_Ch1:
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35

audio/sfx/battle_14.asm

@@ -1,4 +1,4 @@
-SFX_Battle_14_Ch1: ; 20526 (8:4526)
+SFX_Battle_14_Ch1:
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84

audio/sfx/battle_16.asm

@@ -1,4 +1,4 @@
-SFX_Battle_16_Ch1: ; 2054c (8:454c)
+SFX_Battle_16_Ch1:
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68

audio/sfx/battle_17.asm

@@ -1,4 +1,4 @@
-SFX_Battle_17_Ch1: ; 20556 (8:4556)
+SFX_Battle_17_Ch1:
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68

audio/sfx/battle_18.asm

@@ -1,4 +1,4 @@
-SFX_Battle_18_Ch1: ; 20563 (8:4563)
+SFX_Battle_18_Ch1:
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel

audio/sfx/battle_19.asm

@@ -1,4 +1,4 @@
-SFX_Battle_19_Ch1: ; 2056a (8:456a)
+SFX_Battle_19_Ch1:
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52

audio/sfx/battle_1b.asm

@@ -1,4 +1,4 @@
-SFX_Battle_1B_Ch1: ; 2057b (8:457b)
+SFX_Battle_1B_Ch1:
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel

audio/sfx/battle_1c.asm

@@ -1,4 +1,4 @@
-SFX_Battle_1C_Ch1: ; 20582 (8:4582)
+SFX_Battle_1C_Ch1:
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1

audio/sfx/battle_1e.asm

@@ -1,4 +1,4 @@
-SFX_Battle_1E_Ch1: ; 20593 (8:4593)
+SFX_Battle_1E_Ch1:
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,7 +8,7 @@ SFX_Battle_1E_Ch1: ; 20593 (8:4593)
 	endchannel
 
 
-SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
+SFX_Battle_1E_Ch2:
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34

audio/sfx/battle_20.asm

@@ -1,4 +1,4 @@
-SFX_Battle_20_Ch1: ; 205be (8:45be)
+SFX_Battle_20_Ch1:
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel

audio/sfx/battle_21.asm

@@ -1,4 +1,4 @@
-SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
+SFX_Battle_21_Ch1:
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49

audio/sfx/battle_22.asm

@@ -1,4 +1,4 @@
-SFX_Battle_22_Ch1: ; 205d5 (8:45d5)
+SFX_Battle_22_Ch1:
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel

audio/sfx/battle_23.asm

@@ -1,4 +1,4 @@
-SFX_Battle_23_Ch1: ; 205dc (8:45dc)
+SFX_Battle_23_Ch1:
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49

audio/sfx/battle_24.asm

@@ -1,4 +1,4 @@
-SFX_Battle_24_Ch1: ; 205ec (8:45ec)
+SFX_Battle_24_Ch1:
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,7 +6,7 @@ SFX_Battle_24_Ch1: ; 205ec (8:45ec)
 	endchannel
 
 
-SFX_Battle_24_Ch2: ; 205f7 (8:45f7)
+SFX_Battle_24_Ch2:
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel

audio/sfx/battle_25.asm

@@ -1,4 +1,4 @@
-SFX_Battle_25_Ch1: ; 205fe (8:45fe)
+SFX_Battle_25_Ch1:
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65

audio/sfx/battle_26.asm

@@ -1,4 +1,4 @@
-SFX_Battle_26_Ch1: ; 2060e (8:460e)
+SFX_Battle_26_Ch1:
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81

audio/sfx/battle_27.asm

@@ -1,4 +1,4 @@
-SFX_Battle_27_Ch1: ; 20624 (8:4624)
+SFX_Battle_27_Ch1:
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
@@ -9,7 +9,7 @@ SFX_Battle_27_branch_2062a:
 	endchannel
 
 
-SFX_Battle_27_Ch2: ; 20637 (8:4637)
+SFX_Battle_27_Ch2:
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
@@ -20,7 +20,7 @@ SFX_Battle_27_branch_2063d:
 	endchannel
 
 
-SFX_Battle_27_Ch3: ; 2064a (8:464a)
+SFX_Battle_27_Ch3:
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
 	loopchannel 10, SFX_Battle_27_Ch3

audio/sfx/battle_28.asm

@@ -1,4 +1,4 @@
-SFX_Battle_28_Ch1: ; 20655 (8:4655)
+SFX_Battle_28_Ch1:
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
@@ -6,7 +6,7 @@ SFX_Battle_28_Ch1: ; 20655 (8:4655)
 	endchannel
 
 
-SFX_Battle_28_Ch2: ; 20664 (8:4664)
+SFX_Battle_28_Ch2:
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
@@ -14,7 +14,7 @@ SFX_Battle_28_Ch2: ; 20664 (8:4664)
 	endchannel
 
 
-SFX_Battle_28_Ch3: ; 20673 (8:4673)
+SFX_Battle_28_Ch3:
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
 	loopchannel 6, SFX_Battle_28_Ch3

audio/sfx/battle_29.asm

@@ -1,4 +1,4 @@
-SFX_Battle_29_Ch1: ; 2067e (8:467e)
+SFX_Battle_29_Ch1:
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
@@ -8,7 +8,7 @@ SFX_Battle_29_Ch1: ; 2067e (8:467e)
 	endchannel
 
 
-SFX_Battle_29_Ch2: ; 20695 (8:4695)
+SFX_Battle_29_Ch2:
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
 	loopchannel 4, SFX_Battle_29_Ch2

audio/sfx/battle_2a.asm

@@ -1,4 +1,4 @@
-SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
+SFX_Battle_2A_Ch1:
 	dutycycle 57
 	unknownsfx0x20 4, 244, 0, 6
 	unknownsfx0x20 3, 196, 0, 5
@@ -9,7 +9,7 @@ SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
 	endchannel
 
 
-SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
+SFX_Battle_2A_Ch2:
 	dutycycle 141
 	unknownsfx0x20 5, 228, 224, 5
 	unknownsfx0x20 4, 180, 224, 4
@@ -19,7 +19,7 @@ SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
 	endchannel
 
 
-SFX_Battle_2A_Ch3: ; 206db (8:46db)
+SFX_Battle_2A_Ch3:
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51

audio/sfx/battle_2b.asm

@@ -1,4 +1,4 @@
-SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
+SFX_Battle_2B_Ch1:
 	dutycycle 210
 	unknownsfx0x20 3, 129, 0, 3
 	unknownsfx0x20 3, 193, 0, 4
@@ -10,7 +10,7 @@ SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
 	endchannel
 
 
-SFX_Battle_2B_Ch2: ; 2070b (8:470b)
+SFX_Battle_2B_Ch2:
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51

audio/sfx/battle_2c.asm

@@ -1,4 +1,4 @@
-SFX_Battle_2C_Ch1: ; 20722 (8:4722)
+SFX_Battle_2C_Ch1:
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
@@ -7,7 +7,7 @@ SFX_Battle_2C_Ch1: ; 20722 (8:4722)
 	endchannel
 
 
-SFX_Battle_2C_Ch2: ; 20735 (8:4735)
+SFX_Battle_2C_Ch2:
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
@@ -16,7 +16,7 @@ SFX_Battle_2C_Ch2: ; 20735 (8:4735)
 	endchannel
 
 
-SFX_Battle_2C_Ch3: ; 20748 (8:4748)
+SFX_Battle_2C_Ch3:
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66

audio/sfx/battle_2e.asm

@@ -1,4 +1,4 @@
-SFX_Battle_2E_Ch1: ; 20792 (8:4792)
+SFX_Battle_2E_Ch1:
 	duty 0
 	unknownsfx0x20 2, 241, 0, 2
 	unknownsfx0x20 3, 241, 0, 7
@@ -8,7 +8,7 @@ SFX_Battle_2E_Ch1: ; 20792 (8:4792)
 	endchannel
 
 
-SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
+SFX_Battle_2E_Ch2:
 	dutycycle 179
 	unknownsfx0x20 2, 225, 2, 3
 	unknownsfx0x20 3, 225, 242, 7
@@ -18,7 +18,7 @@ SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
 	endchannel
 
 
-SFX_Battle_2E_Ch3: ; 207c0 (8:47c0)
+SFX_Battle_2E_Ch3:
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16

audio/sfx/battle_2f.asm

@@ -1,4 +1,4 @@
-SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
+SFX_Battle_2F_Ch1:
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
@@ -6,7 +6,7 @@ SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
 	endchannel
 
 
-SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
+SFX_Battle_2F_Ch2:
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
@@ -14,7 +14,7 @@ SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
 	endchannel
 
 
-SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
+SFX_Battle_2F_Ch3:
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
 	loopchannel 9, SFX_Battle_2F_Ch3

audio/sfx/battle_31.asm

@@ -1,4 +1,4 @@
-SFX_Battle_31_Ch1: ; 20847 (8:4847)
+SFX_Battle_31_Ch1:
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@ SFX_Battle_31_Ch1: ; 20847 (8:4847)
 	endchannel
 
 
-SFX_Battle_31_Ch2: ; 2085e (8:485e)
+SFX_Battle_31_Ch2:
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7

audio/sfx/battle_32.asm

@@ -1,4 +1,4 @@
-SFX_Battle_32_Ch1: ; 20875 (8:4875)
+SFX_Battle_32_Ch1:
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,7 +6,7 @@ SFX_Battle_32_Ch1: ; 20875 (8:4875)
 	endchannel
 
 
-SFX_Battle_32_Ch2: ; 20880 (8:4880)
+SFX_Battle_32_Ch2:
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel

audio/sfx/battle_33.asm

@@ -1,4 +1,4 @@
-SFX_Battle_33_Ch1: ; 20887 (8:4887)
+SFX_Battle_33_Ch1:
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@ SFX_Battle_33_Ch1: ; 20887 (8:4887)
 	endchannel
 
 
-SFX_Battle_33_Ch2: ; 2089e (8:489e)
+SFX_Battle_33_Ch2:
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5

audio/sfx/battle_34.asm

@@ -1,4 +1,4 @@
-SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
+SFX_Battle_34_Ch1:
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@ SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
 	endchannel
 
 
-SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
+SFX_Battle_34_Ch2:
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,7 +14,7 @@ SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
 	endchannel
 
 
-SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
+SFX_Battle_34_Ch3:
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85