ref: fc9b61e8ac9007221faa2f71377dd49c5880ab47
parent: f4a31b3e0b7ca89e14c4e3836f3d3ad15f38e5ce
author: U-Daniel-PC\Daniel <corrnondacqb@yahoo.com>
date: Fri Jul 3 10:39:24 EDT 2015
Rename/organize part 3 of 4 rename functions, clean up address/wram comments, other misc only broken up so that all changes are viewable on github
--- a/audio.asm
+++ b/audio.asm
@@ -443,7 +443,7 @@
ld [wcfc9], a
ld a, $ff
ld [wMusicHeaderPointer], a
- ld c, $64
+ ld c, 100
call DelayFrames
ld c, BANK(Music_Cities1)
ld a, MUSIC_CITIES1
@@ -557,7 +557,7 @@
SECTION "Audio Engine 3", ROMX, BANK[AUDIO_3]
-Func_7d13b:: ; 7d13b (1f:513b)
+PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
ld a, [$ffdc]
ld c, $0
ld hl, OwnedMonValues
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -141,7 +141,7 @@
.done
ld d, a
ld b, $3
- call Func_9838
+ call Music2_9838
ld [hl], d
ret
@@ -148,7 +148,7 @@
; 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
-Music2_PlayNextNote ; 0x91d0
+Music2_PlayNextNote: ; 0x91d0
ld hl, wc06e
add hl, bc
ld a, [hl]
@@ -238,7 +238,7 @@
ld a, c
cp CH4
jr z, .asm_9265
- call Func_96c7
+ call Music2_96c7
ret c
.asm_9265
ld a, [wc005]
@@ -431,7 +431,7 @@
ld b, a
ld a, d
and $f
- call Func_9858
+ call Music2_9858
ld b, $0
ld hl, wc0a6
add hl, bc
@@ -497,12 +497,12 @@
jp Music2_endchannel
; this appears to never be used
-Music2_unknownmusic0xef ; 0x9407
+Music2_unknownmusic0xef: ; 0x9407
cp $ef ; is this command an unknownmusic0xef?
jr nz, Music2_dutycycle ; no
call Music2_GetNextMusicByte ; yes
push bc
- call Func_9876
+ call Music2_9876
pop bc
ld a, [wc003]
and a
@@ -579,12 +579,12 @@
or d
ld d, a
ld b, $1
- call Func_9838
+ call Music2_9838
ld [hl], d
call Music2_GetNextMusicByte
ld d, a
ld b, $2
- call Func_9838
+ call Music2_9838
ld [hl], d
call Music2_GetNextMusicByte
ld e, a
@@ -598,10 +598,10 @@
.sfxNoiseChannel
ld d, a
push de
- call Func_9629
- call Func_95f8
+ call Music2_9629
+ call Music2_95f8
pop de
- call Func_964b
+ call Music2_964b
ret
Music2_unknownsfx0x10:
@@ -651,7 +651,7 @@
and a
jr nz, .asm_9508
ld a, d
- call Func_9876
+ call Music2_9876
.asm_9508
pop bc
pop de
@@ -668,7 +668,7 @@
add hl, bc
ld a, [hl]
ld l, b
- call Func_9847
+ call Music2_9847
ld a, c
cp CH4
jr nc, .sfxChannel
@@ -682,7 +682,7 @@
ld e, $0
cp CH7
jr z, .skip ; if noise channel
- call Func_9693
+ call Music2_9693
ld a, [wc0ea]
ld d, a
ld a, [wc0eb]
@@ -693,7 +693,7 @@
ld hl, wc0ce
add hl, bc
ld l, [hl]
- call Func_9847
+ call Music2_9847
ld e, l
ld d, h
ld hl, wc0ce
@@ -744,7 +744,7 @@
jr .done
.notSfxChannel3
ld b, $2
- call Func_9838
+ call Music2_9838
ld a, $8
ld [hli], a
inc hl
@@ -758,13 +758,13 @@
ld hl, wc0d6
add hl, bc
ld b, [hl]
- call Func_9858
+ call Music2_9858
ld b, $0
ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_95b8
- call Func_978f
+ call Music2_978f
.asm_95b8
push de
ld a, c
@@ -787,10 +787,10 @@
add hl, bc
ld d, [hl]
ld b, $2
- call Func_9838
+ call Music2_9838
ld [hl], d
- call Func_9629
- call Func_95f8
+ call Music2_9629
+ call Music2_95f8
pop de
ld b, $0
ld hl, wc02e
@@ -804,10 +804,10 @@
ld hl, wc066
add hl, bc
ld [hl], e
- call Func_964b
+ call Music2_964b
ret
-Func_95f8: ; 0x95f8
+Music2_95f8: ; 0x95f8
ld b, $0
ld hl, Unknown_9b27
add hl, bc
@@ -841,7 +841,7 @@
ld [$ff25], a
ret
-Func_9629: ; 0x9629
+Music2_9629: ; 0x9629
ld b, $0
ld hl, wc0b6
add hl, bc
@@ -861,11 +861,11 @@
ld d, a
.channel3
ld b, $1
- call Func_9838
+ call Music2_9838
ld [hl], d
ret
-Func_964b: ; 0x964b
+Music2_964b: ; 0x964b
ld a, c
cp CH2
jr z, .channel3
@@ -909,15 +909,15 @@
and $c7
ld d, a
ld b, $3
- call Func_9838
+ call Music2_9838
ld [hl], e
inc hl
ld [hl], d
- call Func_96b5
+ call Music2_96b5
ret
-Func_9693: ; 0x9693
- call Func_96e5
+Music2_9693: ; 0x9693
+ call Music2_96e5
jr nc, .asm_96ab
ld d, $0
ld a, [wc0f2]
@@ -937,8 +937,8 @@
.asm_96b4
ret
-Func_96b5: ; 0x96b5
- call Func_96e5
+Music2_96b5: ; 0x96b5
+ call Music2_96e5
jr nc, .asm_96c6
ld a, [wc0f1]
add e
@@ -953,8 +953,8 @@
.asm_96c6
ret
-Func_96c7: ; 0x96c7
- call Func_96e5
+Music2_96c7: ; 0x96c7
+ call Music2_96e5
jr nc, .asm_96e2
ld hl, wc006
ld e, c
@@ -976,7 +976,7 @@
ccf
ret
-Func_96e5: ; 0x96e5
+Music2_96e5: ; 0x96e5
ld a, [wc02a]
cp $14
jr nc, .asm_96ee
@@ -1083,7 +1083,7 @@
add hl, bc
ld [hl], d
ld b, $3
- call Func_9838
+ call Music2_9838
ld a, e
ld [hli], a
ld [hl], d
@@ -1095,7 +1095,7 @@
res 5, [hl]
ret
-Func_978f: ; 0x978f
+Music2_978f: ; 0x978f
ld hl, wc096
add hl, bc
ld [hl], d
@@ -1195,7 +1195,7 @@
and $c0
ld d, a
ld b, $1
- call Func_9838
+ call Music2_9838
ld a, [hl]
and $3f
or d
@@ -1220,7 +1220,7 @@
ld [hl], d
ret
-Func_9838: ; 0x9838
+Music2_9838: ; 0x9838
ld a, c
ld hl, Unknown_9b17
add l
@@ -1234,7 +1234,7 @@
ld h, $ff
ret
-Func_9847: ; 0x9847
+Music2_9847: ; 0x9847
ld h, $0
.loop
srl a
@@ -1249,7 +1249,7 @@
.done
ret
-Func_9858: ; 0x9858
+Music2_9858: ; 0x9858
ld h, $0
ld l, a
add hl, hl
@@ -1274,16 +1274,16 @@
ld d, a
ret
-Func_9876:: ; 0x9876
+Music2_9876:: ; 0x9876
ld [wc001], a
cp $ff
- jp z, Func_9a34
+ jp z, Music2_9a34
cp $b9
- jp z, Func_994e
- jp c, Func_994e
+ jp z, Music2_994e
+ jp c, Music2_994e
cp $fe
jr z, .asm_988d
- jp nc, Func_994e
+ jp nc, Music2_994e
.asm_988d
xor a
ld [wc000], a
@@ -1355,9 +1355,9 @@
ld [$ff1a], a
ld a, $77
ld [$ff24], a
- jp Func_9a8f
+ jp Music2_9a8f
-Func_994e: ; 0x994e
+Music2_994e: ; 0x994e
ld l, a
ld e, a
ld h, $0
@@ -1504,11 +1504,11 @@
.asm_9a2b
ld a, c
and a
- jp z, Func_9a8f
+ jp z, Music2_9a8f
dec c
jp .asm_9967
-Func_9a34: ; 0x9a34
+Music2_9a34: ; 0x9a34
ld a, $80
ld [$ff26], a
ld [$ff1a], a
@@ -1556,7 +1556,7 @@
jr nz, .loop
ret
-Func_9a8f: ; 0x9a8f
+Music2_9a8f: ; 0x9a8f
ld a, [wc001]
ld l, a
ld e, a
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -141,7 +141,7 @@
.done
ld d, a
ld b, $3
- call Func_21ff7
+ call Music8_21ff7
ld [hl], d
ret
@@ -245,7 +245,7 @@
ld a, c
cp CH4
jr z, .asm_219e6
- call Func_21e6d
+ call Music8_21e6d
ret c
.asm_219e6
ld a, [wc005]
@@ -438,7 +438,7 @@
ld b, a
ld a, d
and $f
- call Func_22017
+ call Music8_22017
ld b, $0
ld hl, wc0a6
add hl, bc
@@ -509,7 +509,7 @@
jr nz, Music8_dutycycle ; no
call Music8_GetNextMusicByte ; yes
push bc
- call Func_22035
+ call Music8_22035
pop bc
ld a, [wc003]
and a
@@ -586,12 +586,12 @@
or d
ld d, a
ld b, $1
- call Func_21ff7
+ call Music8_21ff7
ld [hl], d
call Music8_GetNextMusicByte
ld d, a
ld b, $2
- call Func_21ff7
+ call Music8_21ff7
ld [hl], d
call Music8_GetNextMusicByte
ld e, a
@@ -605,10 +605,10 @@
.sfxNoiseChannel
ld d, a
push de
- call Func_21daa
- call Func_21d79
+ call Music8_21daa
+ call Music8_21d79
pop de
- call Func_21dcc
+ call Music8_21dcc
ret
Music8_unknownsfx0x10: ; 21c40 (8:5c40)
@@ -658,7 +658,7 @@
and a
jr nz, .asm_21c89
ld a, d
- call Func_22035
+ call Music8_22035
.asm_21c89
pop bc
pop de
@@ -675,7 +675,7 @@
add hl, bc
ld a, [hl]
ld l, b
- call Func_22006
+ call Music8_22006
ld a, c
cp CH4
jr nc, .sfxChannel
@@ -689,7 +689,7 @@
ld e, $0
cp CH7
jr z, .skip ; if noise channel
- call Func_21e2f
+ call Music8_21e2f
ld a, [wc0ea]
ld d, a
ld a, [wc0eb]
@@ -700,7 +700,7 @@
ld hl, wc0ce
add hl, bc
ld l, [hl]
- call Func_22006
+ call Music8_22006
ld e, l
ld d, h
ld hl, wc0ce
@@ -751,7 +751,7 @@
jr .done
.notSfxChannel3
ld b, $2
- call Func_21ff7
+ call Music8_21ff7
ld a, $8
ld [hli], a
inc hl
@@ -765,13 +765,13 @@
ld hl, wc0d6
add hl, bc
ld b, [hl]
- call Func_22017
+ call Music8_22017
ld b, $0
ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_21d39
- call Func_21f4e
+ call Music8_21f4e
.asm_21d39
push de
ld a, c
@@ -794,10 +794,10 @@
add hl, bc
ld d, [hl]
ld b, $2
- call Func_21ff7
+ call Music8_21ff7
ld [hl], d
- call Func_21daa
- call Func_21d79
+ call Music8_21daa
+ call Music8_21d79
pop de
ld b, $0
ld hl, wc02e
@@ -811,10 +811,10 @@
ld hl, wc066
add hl, bc
ld [hl], e
- call Func_21dcc
+ call Music8_21dcc
ret
-Func_21d79: ; 21d79 (8:5d79)
+Music8_21d79: ; 21d79 (8:5d79)
ld b, $0
ld hl, Unknown_222e6
add hl, bc
@@ -848,7 +848,7 @@
ld [$ff25], a
ret
-Func_21daa: ; 21daa (8:5daa)
+Music8_21daa: ; 21daa (8:5daa)
ld b, $0
ld hl, wc0b6
add hl, bc
@@ -868,11 +868,11 @@
ld d, a
.channel3
ld b, $1
- call Func_21ff7
+ call Music8_21ff7
ld [hl], d
ret
-Func_21dcc: ; 21dcc (8:5dcc)
+Music8_21dcc: ; 21dcc (8:5dcc)
ld a, c
cp CH2
jr z, .channel3
@@ -916,7 +916,7 @@
and $c7
ld d, a
ld b, $3
- call Func_21ff7
+ call Music8_21ff7
ld [hl], e
inc hl
ld [hl], d
@@ -923,11 +923,11 @@
ld a, c
cp CH4
jr c, .musicChannel
- call Func_21e56
+ call Music8_21e56
.musicChannel
ret
-Func_21e19: ; 21e19 (8:5e19)
+Music8_21e19: ; 21e19 (8:5e19)
ld a, c
cp CH4
jr nz, .asm_21e2e
@@ -941,10 +941,10 @@
.asm_21e2e
ret
-Func_21e2f: ; 21e2f (8:5e2f)
- call Func_21e8b
+Music8_21e2f: ; 21e2f (8:5e2f)
+ call Music8_21e8b
jr c, .asm_21e39
- call Func_21e9f
+ call Music8_21e9f
jr nc, .asm_21e4c
.asm_21e39
ld d, $0
@@ -965,10 +965,10 @@
.asm_21e55
ret
-Func_21e56: ; 21e56 (8:5e56)
- call Func_21e8b
+Music8_21e56: ; 21e56 (8:5e56)
+ call Music8_21e8b
jr c, .asm_21e60
- call Func_21e9f
+ call Music8_21e9f
jr nc, .asm_21e6c
.asm_21e60
ld a, [wc0f1]
@@ -984,8 +984,8 @@
.asm_21e6c
ret
-Func_21e6d: ; 21e6d (8:5e6d)
- call Func_21e8b
+Music8_21e6d: ; 21e6d (8:5e6d)
+ call Music8_21e8b
jr nc, .asm_21e88
ld hl, wc006
ld e, c
@@ -1007,7 +1007,7 @@
ccf
ret
-Func_21e8b: ; 21e8b (8:5e8b)
+Music8_21e8b: ; 21e8b (8:5e8b)
ld a, [wc02a]
cp $14
jr nc, .asm_21e94
@@ -1024,7 +1024,7 @@
scf
ret
-Func_21e9f: ; 21e9f (8:5e9f)
+Music8_21e9f: ; 21e9f (8:5e9f)
ld a, [wc02d]
ld b, a
ld a, [wc02a]
@@ -1134,7 +1134,7 @@
add hl, bc
ld [hl], d
ld b, $3
- call Func_21ff7
+ call Music8_21ff7
ld a, e
ld [hli], a
ld [hl], d
@@ -1146,7 +1146,7 @@
res 5, [hl]
ret
-Func_21f4e: ; 21f4e (8:5f4e)
+Music8_21f4e: ; 21f4e (8:5f4e)
ld hl, wc096
add hl, bc
ld [hl], d
@@ -1246,7 +1246,7 @@
and $c0
ld d, a
ld b, $1
- call Func_21ff7
+ call Music8_21ff7
ld a, [hl]
and $3f
or d
@@ -1271,7 +1271,7 @@
ld [hl], d
ret
-Func_21ff7: ; 21ff7 (8:5ff7)
+Music8_21ff7: ; 21ff7 (8:5ff7)
ld a, c
ld hl, Unknown_222d6
add l
@@ -1285,7 +1285,7 @@
ld h, $ff
ret
-Func_22006: ; 22006 (8:6006)
+Music8_22006: ; 22006 (8:6006)
ld h, $0
.loop
srl a
@@ -1300,7 +1300,7 @@
.done
ret
-Func_22017: ; 22017 (8:6017)
+Music8_22017: ; 22017 (8:6017)
ld h, $0
ld l, a
add hl, hl
@@ -1325,16 +1325,16 @@
ld d, a
ret
-Func_22035:: ; 22035 (8:6035)
+Music8_22035:: ; 22035 (8:6035)
ld [wc001], a
cp $ff
- jp z, Func_221f3
+ jp z, Music8_221f3
cp $e9
- jp z, Func_2210d
- jp c, Func_2210d
+ jp z, Music8_2210d
+ jp c, Music8_2210d
cp $fe
jr z, .asm_2204c
- jp nc, Func_2210d
+ jp nc, Music8_2210d
.asm_2204c
xor a
ld [wc000], a
@@ -1406,9 +1406,9 @@
ld [$ff1a], a
ld a, $77
ld [$ff24], a
- jp Func_2224e
+ jp Music8_2224e
-Func_2210d: ; 2210d (8:610d)
+Music8_2210d: ; 2210d (8:610d)
ld l, a
ld e, a
ld h, $0
@@ -1555,11 +1555,11 @@
.asm_221ea
ld a, c
and a
- jp z, Func_2224e
+ jp z, Music8_2224e
dec c
jp .asm_22126
-Func_221f3: ; 221f3 (8:61f3)
+Music8_221f3: ; 221f3 (8:61f3)
ld a, $80
ld [$ff26], a
ld [$ff1a], a
@@ -1607,7 +1607,7 @@
jr nz, .loop
ret
-Func_2224e: ; 2224e (8:624e)
+Music8_2224e: ; 2224e (8:624e)
ld a, [wc001]
ld l, a
ld e, a
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -141,7 +141,7 @@
.done
ld d, a
ld b, $3
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], d
ret
@@ -238,7 +238,7 @@
ld a, c
cp CH4
jr z, .asm_7d2d9
- call Func_7d73b
+ call Music1f_7d73b
ret c
.asm_7d2d9
ld a, [wc005]
@@ -431,7 +431,7 @@
ld b, a
ld a, d
and $f
- call Func_7d8cc
+ call Music1f_7d8cc
ld b, $0
ld hl, wc0a6
add hl, bc
@@ -502,7 +502,7 @@
jr nz, Music1f_dutycycle ; no
call Music1f_GetNextMusicByte ; yes
push bc
- call Func_7d8ea
+ call Music1f_7d8ea
pop bc
ld a, [wc003]
and a
@@ -579,12 +579,12 @@
or d
ld d, a
ld b, $1
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], d
call Music1f_GetNextMusicByte
ld d, a
ld b, $2
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], d
call Music1f_GetNextMusicByte
ld e, a
@@ -598,13 +598,13 @@
.sfxNoiseChannel
ld d, a
push de
- call Func_7d69d
- call Func_7d66c
+ call Music1f_7d69d
+ call Music1f_7d66c
pop de
- call Func_7d6bf
+ call Music1f_7d6bf
ret
-Music1f_unknownsfx0x10 ; 7d533 (1f:5533)
+Music1f_unknownsfx0x10: ; 7d533 (1f:5533)
ld a, c
cp CH4
jr c, Music1f_note ; if not a sfx
@@ -651,7 +651,7 @@
and a
jr nz, .asm_7d57c
ld a, d
- call Func_7d8ea
+ call Music1f_7d8ea
.asm_7d57c
pop bc
pop de
@@ -668,7 +668,7 @@
add hl, bc
ld a, [hl]
ld l, b
- call Func_7d8bb
+ call Music1f_7d8bb
ld a, c
cp CH4
jr nc, .sfxChannel
@@ -682,7 +682,7 @@
ld e, $0
cp CH7
jr z, .skip ; if noise channel
- call Func_7d707
+ call Music1f_7d707
ld a, [wc0ea]
ld d, a
ld a, [wc0eb]
@@ -693,7 +693,7 @@
ld hl, wc0ce
add hl, bc
ld l, [hl]
- call Func_7d8bb
+ call Music1f_7d8bb
ld e, l
ld d, h
ld hl, wc0ce
@@ -744,7 +744,7 @@
jr .quit
.notSfxChannel3
ld b, $2
- call Func_7d8ac
+ call Music1f_7d8ac
ld a, $8
ld [hli], a
inc hl
@@ -758,13 +758,13 @@
ld hl, wc0d6
add hl, bc
ld b, [hl]
- call Func_7d8cc
+ call Music1f_7d8cc
ld b, $0
ld hl, wc02e
add hl, bc
bit 4, [hl]
jr z, .asm_7d62c
- call Func_7d803
+ call Music1f_7d803
.asm_7d62c
push de
ld a, c
@@ -787,10 +787,10 @@
add hl, bc
ld d, [hl]
ld b, $2
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], d
- call Func_7d69d
- call Func_7d66c
+ call Music1f_7d69d
+ call Music1f_7d66c
pop de
ld b, $0
ld hl, wc02e
@@ -804,10 +804,10 @@
ld hl, wc066
add hl, bc
ld [hl], e
- call Func_7d6bf
+ call Music1f_7d6bf
ret
-Func_7d66c: ; 7d66c (1f:566c)
+Music1f_7d66c: ; 7d66c (1f:566c)
ld b, $0
ld hl, Unknown_7db9b
add hl, bc
@@ -841,7 +841,7 @@
ld [$ff25], a
ret
-Func_7d69d: ; 7d69d (1f:569d)
+Music1f_7d69d: ; 7d69d (1f:569d)
ld b, $0
ld hl, wc0b6
add hl, bc
@@ -861,11 +861,11 @@
ld d, a
.channel3
ld b, $1
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], d
ret
-Func_7d6bf: ; 7d6bf (1f:56bf)
+Music1f_7d6bf: ; 7d6bf (1f:56bf)
ld a, c
cp CH2
jr z, .channel3
@@ -909,15 +909,15 @@
and $c7
ld d, a
ld b, $3
- call Func_7d8ac
+ call Music1f_7d8ac
ld [hl], e
inc hl
ld [hl], d
- call Func_7d729
+ call Music1f_7d729
ret
-Func_7d707: ; 7d707 (1f:5707)
- call Func_7d759
+Music1f_7d707: ; 7d707 (1f:5707)
+ call Music1f_7d759
jr nc, .asm_7d71f
ld d, $0
ld a, [wc0f2]
@@ -937,8 +937,8 @@
.asm_7d728
ret
-Func_7d729: ; 7d729 (1f:5729)
- call Func_7d759
+Music1f_7d729: ; 7d729 (1f:5729)
+ call Music1f_7d759
jr nc, .asm_7d73a
ld a, [wc0f1]
add e
@@ -953,8 +953,8 @@
.asm_7d73a
ret
-Func_7d73b: ; 7d73b (1f:573b)
- call Func_7d759
+Music1f_7d73b: ; 7d73b (1f:573b)
+ call Music1f_7d759
jr nc, .asm_7d756
ld hl, wc006
ld e, c
@@ -976,7 +976,7 @@
ccf
ret
-Func_7d759: ; 7d759 (1f:5759)
+Music1f_7d759: ; 7d759 (1f:5759)
ld a, [wc02a]
cp $14
jr nc, .asm_7d762
@@ -1083,7 +1083,7 @@
add hl, bc
ld [hl], d
ld b, $3
- call Func_7d8ac
+ call Music1f_7d8ac
ld a, e
ld [hli], a
ld [hl], d
@@ -1095,7 +1095,7 @@
res 5, [hl]
ret
-Func_7d803: ; 7d803 (1f:5803)
+Music1f_7d803: ; 7d803 (1f:5803)
ld hl, wc096
add hl, bc
ld [hl], d
@@ -1195,7 +1195,7 @@
and $c0
ld d, a
ld b, $1
- call Func_7d8ac
+ call Music1f_7d8ac
ld a, [hl]
and $3f
or d
@@ -1220,7 +1220,7 @@
ld [hl], d
ret
-Func_7d8ac: ; 7d8ac (1f:58ac)
+Music1f_7d8ac: ; 7d8ac (1f:58ac)
ld a, c
ld hl, Unknown_7db8b
add l
@@ -1234,7 +1234,7 @@
ld h, $ff
ret
-Func_7d8bb: ; 7d8bb (1f:58bb)
+Music1f_7d8bb: ; 7d8bb (1f:58bb)
ld h, $0
.loop
srl a
@@ -1249,7 +1249,7 @@
.done
ret
-Func_7d8cc: ; 7d8cc (1f:58cc)
+Music1f_7d8cc: ; 7d8cc (1f:58cc)
ld h, $0
ld l, a
add hl, hl
@@ -1274,16 +1274,16 @@
ld d, a
ret
-Func_7d8ea:: ; 7d8ea (1f:58ea)
+Music1f_7d8ea:: ; 7d8ea (1f:58ea)
ld [wc001], a
cp $ff
- jp z, Func_7daa8
+ jp z, Music1f_7daa8
cp $c2
- jp z, Func_7d9c2
- jp c, Func_7d9c2
+ jp z, Music1f_7d9c2
+ jp c, Music1f_7d9c2
cp $fe
jr z, .asm_7d901
- jp nc, Func_7d9c2
+ jp nc, Music1f_7d9c2
.asm_7d901
xor a
ld [wc000], a
@@ -1355,9 +1355,9 @@
ld [$ff1a], a
ld a, $77
ld [$ff24], a
- jp Func_7db03
+ jp Music1f_7db03
-Func_7d9c2: ; 7d9c2 (1f:59c2)
+Music1f_7d9c2: ; 7d9c2 (1f:59c2)
ld l, a
ld e, a
ld h, $0
@@ -1504,11 +1504,11 @@
.asm_7da9f
ld a, c
and a
- jp z, Func_7db03
+ jp z, Music1f_7db03
dec c
jp .asm_7d9db
-Func_7daa8: ; 7daa8 (1f:5aa8)
+Music1f_7daa8: ; 7daa8 (1f:5aa8)
ld a, $80
ld [$ff26], a
ld [$ff1a], a
@@ -1556,7 +1556,7 @@
jr nz, .loop
ret
-Func_7db03: ; 7db03 (1f:5b03)
+Music1f_7db03: ; 7db03 (1f:5b03)
ld a, [wc001]
ld l, a
ld e, a
--- a/audio/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders02.asm
@@ -182,5 +182,3 @@
dw Music_IndigoPlateau_Ch3
db CH3
dw Music_IndigoPlateau_Ch4
-
-; 0x82fd
--- a/audio/headers/musicheaders1f.asm
+++ b/audio/headers/musicheaders1f.asm
@@ -156,5 +156,3 @@
dw Music_MeetMaleTrainer_Ch2
db CH2
dw Music_MeetMaleTrainer_Ch3
-
-; 0x7c2fd
--- a/audio/headers/sfxheaders02.asm
+++ b/audio/headers/sfxheaders02.asm
@@ -560,5 +560,3 @@
SFX_02_5f:: ; 822b (2:422b)
db CH4
dw SFX_02_5f_Ch1
-
-; 0x822e
--- a/audio/headers/sfxheaders08.asm
+++ b/audio/headers/sfxheaders08.asm
@@ -704,5 +704,3 @@
SFX_08_77:: ; 202bb (8:42bb)
db CH4
dw SFX_08_77_Ch1
-
-; 0x202be
--- a/audio/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
@@ -594,5 +594,3 @@
SFX_1f_67:: ; 7c246 (1f:4246)
db CH4
dw SFX_1f_67_Ch1
-
-; 0x7c249
--- a/audio/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
@@ -702,4 +702,3 @@
triangle3 1
triangle3 1
endchannel
-; 0x7ded1
--- a/audio/music/celadon.asm
+++ b/audio/music/celadon.asm
@@ -409,4 +409,3 @@
F# 2
E_ 2
loopchannel 0, Music_Celadon_branch_b7c1
-; 0xb86d
--- a/audio/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
@@ -352,4 +352,3 @@
C_ 1
rest 1
loopchannel 0, Music_Cinnabar_branch_b93f
-; 0xb9eb
--- a/audio/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
@@ -170,4 +170,3 @@
rest 8
cymbal3 8
loopchannel 0, Music_CinnabarMansion_branch_7edb5
-; 0x7edda
--- a/audio/music/cities1.asm
+++ b/audio/music/cities1.asm
@@ -655,4 +655,3 @@
triangle2 2
triangle2 2
endchannel
-; 0xad77
--- a/audio/music/cities2.asm
+++ b/audio/music/cities2.asm
@@ -414,4 +414,3 @@
E_ 2
G# 2
loopchannel 0, Music_Cities2_branch_b64c
-; 0xb6c7
--- a/audio/music/credits.asm
+++ b/audio/music/credits.asm
@@ -818,4 +818,3 @@
A_ 1
rest 3
endchannel
-; 0x7fffa
--- a/audio/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
@@ -605,4 +605,3 @@
G_ 2
E_ 2
loopchannel 0, Music_DefeatedGymLeader_branch_23e65
-; 0x23f52
--- a/audio/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
@@ -264,4 +264,3 @@
octave 4
A_ 3
loopchannel 0, Music_DefeatedTrainer_branch_23b24
-; 0x23b74
--- a/audio/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
@@ -300,4 +300,3 @@
octave 4
D# 4
loopchannel 0, Music_DefeatedWildMon_branch_23c21
-; 0x23cad
--- a/audio/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
@@ -673,4 +673,3 @@
snare8 4
snare9 4
endchannel
-; 0x7e20b
--- a/audio/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
@@ -315,4 +315,3 @@
snare9 4
snare7 4
loopchannel 0, Music_Dungeon2_branch_7e9dd
-; 0x7e9f1
--- a/audio/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
@@ -754,4 +754,3 @@
rest 16
rest 10
endchannel
-; 0x7ed0f
--- a/audio/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
@@ -1342,4 +1342,3 @@
octave 5
E_ 2
endchannel
-; 0x2397d
--- a/audio/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
@@ -625,4 +625,3 @@
A_ 1
rest 1
endchannel
-; 0x7e4c0
--- a/audio/music/gym.asm
+++ b/audio/music/gym.asm
@@ -355,4 +355,3 @@
F_ 2
A# 2
endchannel
-; 0xbe56
--- a/audio/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
@@ -1398,4 +1398,3 @@
octave 4
G_ 6
loopchannel 0, Music_GymLeaderBattle_branch_227b1
-; 0x22919
--- a/audio/music/halloffame.asm
+++ b/audio/music/halloffame.asm
@@ -94,4 +94,3 @@
E_ 4
G_ 4
loopchannel 0, Music_HallOfFame_Ch3
-; 0x7fc1f
--- a/audio/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
@@ -319,4 +319,3 @@
mutedsnare3 1
mutedsnare3 1
endchannel
-; 0xa7c5
--- a/audio/music/introbattle.asm
+++ b/audio/music/introbattle.asm
@@ -327,4 +327,3 @@
rest 16
rest 14
endchannel
-; 0x7fa19
--- a/audio/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
@@ -38,4 +38,3 @@
G# 4
E_ 10
endchannel
-; 0x7fbaf
--- a/audio/music/lavender.asm
+++ b/audio/music/lavender.asm
@@ -197,4 +197,3 @@
triangle2 8
triangle2 8
loopchannel 0, Music_Lavender_branch_bc26
-; 0xbc2e
--- a/audio/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
@@ -78,4 +78,3 @@
rest 3
A# 4
loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
-; 0x7f6f9
--- a/audio/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
@@ -116,4 +116,3 @@
F# 1
rest 1
endchannel
-; 0x7f77b
--- a/audio/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
@@ -188,4 +188,3 @@
D# 1
rest 1
loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
-; 0x7f844
--- a/audio/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
@@ -421,4 +421,3 @@
rest 1
loopchannel 2, Music_MeetProfOak_branch_b101
loopchannel 0, Music_MeetProfOak_branch_b0bc
-; 0xb119
--- a/audio/music/meetrival.asm
+++ b/audio/music/meetrival.asm
@@ -394,4 +394,3 @@
G_ 1
rest 1
loopchannel 0, Music_MeetRival_branch_b24b
-; 0xb2c8
--- a/audio/music/museumguy.asm
+++ b/audio/music/museumguy.asm
@@ -335,4 +335,3 @@
mutedsnare3 1
mutedsnare3 1
loopchannel 0, Music_MuseumGuy_branch_aee1
-; 0xaf59
--- a/audio/music/oakslab.asm
+++ b/audio/music/oakslab.asm
@@ -391,4 +391,3 @@
E_ 1
rest 3
loopchannel 0, Music_OaksLab_branch_7ef5c
-; 0x7f04a
--- a/audio/music/pallettown.asm
+++ b/audio/music/pallettown.asm
@@ -312,4 +312,3 @@
F# 8
loopchannel 0, Music_PalletTown_branch_a8e3
endchannel
-; 0xa913
--- a/audio/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
@@ -45,4 +45,3 @@
E_ 6
rest 2
endchannel
-; 0x9bde
--- a/audio/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
@@ -373,4 +373,3 @@
F# 2
A_ 2
endchannel
-; 0xbff4
--- a/audio/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
@@ -456,4 +456,3 @@
D# 1
rest 1
loopchannel 0, Music_PokemonTower_branch_7f1a2
-; 0x7f243
--- a/audio/music/routes1.asm
+++ b/audio/music/routes1.asm
@@ -402,4 +402,3 @@
mutedsnare1 2
loopchannel 0, Music_Routes1_Ch4
endchannel
-; 0x9db9
--- a/audio/music/routes2.asm
+++ b/audio/music/routes2.asm
@@ -423,4 +423,3 @@
rest 3
loopchannel 0, Music_Routes2_Ch4
endchannel
-; 0x9fad
--- a/audio/music/routes3.asm
+++ b/audio/music/routes3.asm
@@ -513,4 +513,3 @@
mutedsnare3 1
mutedsnare3 1
loopchannel 0, Music_Routes3_branch_a17a
-; 0xa26a
--- a/audio/music/routes4.asm
+++ b/audio/music/routes4.asm
@@ -679,4 +679,3 @@
mutedsnare2 2
mutedsnare2 2
loopchannel 0, Music_Routes4_branch_a4a8
-; 0xa5f0
--- a/audio/music/safarizone.asm
+++ b/audio/music/safarizone.asm
@@ -109,4 +109,3 @@
A_ 2
rest 2
endchannel
-; 0xbcbb
--- a/audio/music/silphco.asm
+++ b/audio/music/silphco.asm
@@ -998,4 +998,3 @@
E_ 4
F_ 4
loopchannel 0, Music_SilphCo_branch_7f5c9
-; 0x7f69d
--- a/audio/music/ssanne.asm
+++ b/audio/music/ssanne.asm
@@ -336,4 +336,3 @@
G# 8
B_ 8
loopchannel 0, Music_SSAnne_Ch3
-; 0xb504
--- a/audio/music/surfing.asm
+++ b/audio/music/surfing.asm
@@ -333,4 +333,3 @@
D_ 2
E_ 2
loopchannel 0, Music_Surfing_branch_7fb03
-; 0x7fb7d
--- a/audio/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
@@ -675,4 +675,3 @@
snare2 1
rest 3
endchannel
-; 0x7e850
--- a/audio/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
@@ -1855,4 +1855,3 @@
D_ 2
C_ 2
loopchannel 0, Music_TrainerBattle_branch_22d9c
-; 0x23099
--- a/audio/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
@@ -336,4 +336,3 @@
rest 6
loopchannel 0, Music_UnusedSong_branch_a9d8
endchannel
-; 0xaa6f
--- a/audio/music/vermilion.asm
+++ b/audio/music/vermilion.asm
@@ -321,4 +321,3 @@
triangle1 1
triangle1 1
endchannel
-; 0xbb58
--- a/audio/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
@@ -736,4 +736,3 @@
C# 2
G# 2
loopchannel 0, Music_WildBattle_branch_232d8
-; 0x233a6
--- a/audio/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
@@ -307,4 +307,3 @@
rest 1
loopchannel 0, Music_MeetJessieJames_branch_83235
endchannel
-; 0x832ba
--- a/audio/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
@@ -688,4 +688,3 @@
D# 1
rest 1
loopchannel 0, Music_SurfingPikachu_branch_82ea0
-; 0x82fbe
--- a/audio/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
@@ -482,4 +482,3 @@
E_ 1
rest 15
endchannel
-; 0x7f860
--- a/audio/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
@@ -324,4 +324,3 @@
snare3 4
snare3 4
loopchannel 0, Music_YellowUnusedSong_branch_830c3
-; 0x8316d
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/sfx_02_01.asm
@@ -1,4 +1,3 @@
SFX_02_01_Ch1: ; 82fd (2:42fd)
unknownnoise0x20 0, 193, 51
endchannel
-; 0x8301
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/sfx_02_02.asm
@@ -1,4 +1,3 @@
SFX_02_02_Ch1: ; 8301 (2:4301)
unknownnoise0x20 0, 177, 51
endchannel
-; 0x8305
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/sfx_02_03.asm
@@ -1,4 +1,3 @@
SFX_02_03_Ch1: ; 8305 (2:4305)
unknownnoise0x20 0, 161, 51
endchannel
-; 0x8309
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/sfx_02_04.asm
@@ -1,4 +1,3 @@
SFX_02_04_Ch1: ; 8309 (2:4309)
unknownnoise0x20 0, 129, 51
endchannel
-; 0x830d
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/sfx_02_05.asm
@@ -6,4 +6,3 @@
unknownnoise0x20 3, 130, 51
unknownnoise0x20 2, 129, 50
endchannel
-; 0x8320
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/sfx_02_06.asm
@@ -1,4 +1,3 @@
SFX_02_06_Ch1: ; 8320 (2:4320)
unknownnoise0x20 0, 81, 42
endchannel
-; 0x8324
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/sfx_02_07.asm
@@ -2,4 +2,3 @@
unknownnoise0x20 1, 65, 43
unknownnoise0x20 0, 97, 42
endchannel
-; 0x832b
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/sfx_02_08.asm
@@ -1,4 +1,3 @@
SFX_02_08_Ch1: ; 832b (2:432b)
unknownnoise0x20 0, 129, 16
endchannel
-; 0x832f
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/sfx_02_09.asm
@@ -1,4 +1,3 @@
SFX_02_09_Ch1: ; 832f (2:432f)
unknownnoise0x20 0, 130, 35
endchannel
-; 0x8333
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/sfx_02_0a.asm
@@ -1,4 +1,3 @@
SFX_02_0a_Ch1: ; 8333 (2:4333)
unknownnoise0x20 0, 130, 37
endchannel
-; 0x8337
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/sfx_02_0b.asm
@@ -1,4 +1,3 @@
SFX_02_0b_Ch1: ; 8337 (2:4337)
unknownnoise0x20 0, 130, 38
endchannel
-; 0x833b
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/sfx_02_0c.asm
@@ -1,4 +1,3 @@
SFX_02_0c_Ch1: ; 833b (2:433b)
unknownnoise0x20 0, 161, 16
endchannel
-; 0x833f
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/sfx_02_0d.asm
@@ -1,4 +1,3 @@
SFX_02_0d_Ch1: ; 833f (2:433f)
unknownnoise0x20 0, 162, 17
endchannel
-; 0x8343
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/sfx_02_0e.asm
@@ -1,4 +1,3 @@
SFX_02_0e_Ch1: ; 8343 (2:4343)
unknownnoise0x20 0, 162, 80
endchannel
-; 0x8347
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/sfx_02_0f.asm
@@ -2,4 +2,3 @@
unknownnoise0x20 0, 161, 24
unknownnoise0x20 0, 49, 51
endchannel
-; 0x834e
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/sfx_02_10.asm
@@ -2,4 +2,3 @@
unknownnoise0x20 2, 145, 40
unknownnoise0x20 0, 113, 24
endchannel
-; 0x8355
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/sfx_02_11.asm
@@ -1,4 +1,3 @@
SFX_02_11_Ch1: ; 8355 (2:4355)
unknownnoise0x20 0, 145, 34
endchannel
-; 0x8359
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/sfx_02_12.asm
@@ -1,4 +1,3 @@
SFX_02_12_Ch1: ; 8359 (2:4359)
unknownnoise0x20 0, 113, 34
endchannel
-; 0x835d
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/sfx_02_13.asm
@@ -1,4 +1,3 @@
SFX_02_13_Ch1: ; 835d (2:435d)
unknownnoise0x20 0, 97, 34
endchannel
-; 0x8361
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/sfx_02_14.asm
@@ -19,4 +19,3 @@
unknownnoise0x20 14, 148, 44
unknownnoise0x20 8, 129, 28
endchannel
-; 0x89af
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/sfx_02_15.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 3, 130, 28
unknownnoise0x20 8, 113, 44
endchannel
-; 0x8bca
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/sfx_02_16.asm
@@ -15,4 +15,3 @@
SFX_02_16_Ch3: ; 8b29 (2:4b29)
endchannel
-; 0x8b2a
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/sfx_02_17.asm
@@ -28,4 +28,3 @@
unknownnoise0x20 12, 182, 76
unknownnoise0x20 15, 162, 92
endchannel
-; 0x88f1
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/sfx_02_18.asm
@@ -30,4 +30,3 @@
unknownnoise0x20 7, 195, 76
unknownnoise0x20 8, 161, 92
endchannel
-; 0x8ca6
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/sfx_02_19.asm
@@ -17,4 +17,3 @@
SFX_02_19_Ch3: ; 8a5a (2:4a5a)
endchannel
-; 0x8a5b
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/sfx_02_1a.asm
@@ -20,4 +20,3 @@
unknownnoise0x20 15, 215, 156
unknownnoise0x20 15, 242, 172
endchannel
-; 0x8a0d
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/sfx_02_1b.asm
@@ -19,4 +19,3 @@
unknownnoise0x20 15, 230, 76
unknownnoise0x20 8, 177, 92
endchannel
-; 0x8a35
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/sfx_02_1c.asm
@@ -21,4 +21,3 @@
unknownnoise0x20 11, 215, 92
unknownnoise0x20 15, 194, 76
endchannel
-; 0x8c55
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/sfx_02_1d.asm
@@ -33,4 +33,3 @@
unknownnoise0x20 6, 212, 61
unknownnoise0x20 8, 193, 59
endchannel
-; 0x8786
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/sfx_02_1e.asm
@@ -33,4 +33,3 @@
unknownnoise0x20 3, 164, 44
unknownnoise0x20 8, 145, 60
endchannel
-; 0x8c25
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/sfx_02_1f.asm
@@ -35,4 +35,3 @@
unknownnoise0x20 4, 193, 44
unknownnoise0x20 8, 161, 76
endchannel
-; 0x8abe
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/sfx_02_20.asm
@@ -27,4 +27,3 @@
SFX_02_20_Ch3: ; 8b0b (2:4b0b)
endchannel
-; 0x8b0c
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/sfx_02_21.asm
@@ -38,4 +38,3 @@
unknownnoise0x20 9, 194, 44
unknownnoise0x20 4, 161, 60
endchannel
-; 0x8b97
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/sfx_02_22.asm
@@ -21,4 +21,3 @@
unknownnoise0x20 2, 97, 33
unknownnoise0x20 8, 97, 17
endchannel
-; 0x89df
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/sfx_02_23.asm
@@ -27,4 +27,3 @@
unknownnoise0x20 8, 183, 92
unknownnoise0x20 15, 194, 93
endchannel
-; 0x8937
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/sfx_02_24.asm
@@ -29,4 +29,3 @@
unknownnoise0x20 4, 116, 16
unknownnoise0x20 4, 113, 32
endchannel
-; 0x8987
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/sfx_02_25.asm
@@ -32,4 +32,3 @@
unknownnoise0x20 12, 210, 61
unknownnoise0x20 8, 209, 44
endchannel
-; 0x886b
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/sfx_02_26.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 3, 194, 108
unknownnoise0x20 8, 209, 92
endchannel
-; 0x8d5e
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/sfx_02_27.asm
@@ -28,4 +28,3 @@
unknownnoise0x20 8, 179, 76
unknownnoise0x20 8, 161, 92
endchannel
-; 0x8da7
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/sfx_02_28.asm
@@ -19,4 +19,3 @@
unknownnoise0x20 14, 196, 60
unknownnoise0x20 8, 209, 44
endchannel
-; 0x8dcf
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/sfx_02_29.asm
@@ -28,4 +28,3 @@
unknownnoise0x20 3, 162, 92
unknownnoise0x20 8, 177, 108
endchannel
-; 0x8e7e
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/sfx_02_2a.asm
@@ -19,4 +19,3 @@
unknownnoise0x20 4, 230, 60
unknownnoise0x20 15, 242, 76
endchannel
-; 0x8cf0
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/sfx_02_2b.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 9, 228, 124
unknownnoise0x20 15, 226, 108
endchannel
-; 0x8eb1
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/sfx_02_2c.asm
@@ -32,4 +32,3 @@
unknownnoise0x20 6, 180, 60
unknownnoise0x20 8, 193, 44
endchannel
-; 0x8fe7
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/sfx_02_2d.asm
@@ -16,4 +16,3 @@
SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
endchannel
-; 0x8cc8
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/sfx_02_2e.asm
@@ -28,4 +28,3 @@
unknownnoise0x20 2, 226, 60
unknownnoise0x20 8, 209, 44
endchannel
-; 0x8f48
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/sfx_02_2f.asm
@@ -24,4 +24,3 @@
unknownnoise0x20 5, 163, 60
unknownnoise0x20 8, 145, 44
endchannel
-; 0x8d2b
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/sfx_02_30.asm
@@ -29,4 +29,3 @@
unknownnoise0x20 8, 196, 108
unknownnoise0x20 15, 179, 92
endchannel
-; 0x8eff
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/sfx_02_31.asm
@@ -27,4 +27,3 @@
unknownnoise0x20 1, 178, 91
unknownnoise0x20 15, 194, 76
endchannel
-; 0x8f8e
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/sfx_02_32.asm
@@ -36,4 +36,3 @@
unknownnoise0x20 5, 146, 26
unknownnoise0x20 8, 129, 24
endchannel
-; 0x8e35
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/sfx_02_33.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 8, 196, 69
unknownnoise0x20 8, 177, 68
endchannel
-; 0x901a
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/sfx_02_34.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 14, 210, 86
unknownnoise0x20 8, 209, 102
endchannel
-; 0x904d
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/sfx_02_35.asm
@@ -25,4 +25,3 @@
SFX_02_35_Ch3: ; 9092 (2:5092)
endchannel
-; 0x9093
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/sfx_02_36.asm
@@ -22,4 +22,3 @@
unknownnoise0x20 1, 162, 57
unknownnoise0x20 8, 145, 73
endchannel
-; 0x90c6
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/sfx_02_37.asm
@@ -23,4 +23,3 @@
unknownnoise0x20 15, 215, 60
unknownnoise0x20 8, 193, 44
endchannel
-; 0x87bd
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/sfx_02_38.asm
@@ -31,4 +31,3 @@
unknownnoise0x20 12, 183, 76
unknownnoise0x20 15, 162, 92
endchannel
-; 0x8813
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/sfx_02_39.asm
@@ -24,4 +24,3 @@
unknownnoise0x20 10, 182, 44
unknownnoise0x20 8, 145, 28
endchannel
-; 0x88a6
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
@@ -45,4 +45,3 @@
B_ 2
rest 2
endchannel
-; 0xadae
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
@@ -67,4 +67,3 @@
rest 1
A_ 8
endchannel
-; 0xb362
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/sfx_02_3c.asm
@@ -6,4 +6,3 @@
unknownsfx0x20 8, 226, 0, 2
unknownsfx0x10 8
endchannel
-; 0x841b
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/sfx_02_3d.asm
@@ -5,4 +5,3 @@
unknownsfx0x20 15, 242, 80, 6
unknownsfx0x10 8
endchannel
-; 0x84c6
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/sfx_02_3e.asm
@@ -7,4 +7,3 @@
unknownsfx0x20 15, 242, 0, 6
unknownsfx0x10 8
endchannel
-; 0x84ee
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/sfx_02_3f.asm
@@ -2,4 +2,3 @@
unknownnoise0x20 1, 226, 51
unknownnoise0x20 8, 225, 34
endchannel
-; 0x83ca
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/sfx_02_40.asm
@@ -5,4 +5,3 @@
unknownsfx0x20 0, 145, 192, 7
unknownsfx0x20 12, 161, 208, 7
endchannel
-; 0x8475
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
@@ -75,4 +75,3 @@
F_ 2
rest 2
endchannel
-; 0xb316
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
@@ -57,4 +57,3 @@
F_ 4
D# 8
endchannel
-; 0xb3a7
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/sfx_02_43.asm
@@ -6,4 +6,3 @@
unknownsfx0x20 15, 243, 0, 6
unknownsfx0x10 8
endchannel
-; 0x84d9
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/sfx_02_44.asm
@@ -5,4 +5,3 @@
unknownsfx0x20 15, 242, 80, 6
unknownsfx0x10 8
endchannel
-; 0x84fd
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/sfx_02_45.asm
@@ -11,4 +11,3 @@
unknownsfx0x20 3, 161, 192, 7
unknownsfx0x20 8, 161, 0, 7
endchannel
-; 0x8528
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/sfx_02_46.asm
@@ -5,4 +5,3 @@
unknownsfx0x20 4, 240, 0, 2
unknownsfx0x20 1, 0, 0, 0
endchannel
-; 0x853b
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/sfx_02_47.asm
@@ -5,4 +5,3 @@
unknownsfx0x20 6, 240, 0, 7
unknownsfx0x20 1, 0, 0, 0
endchannel
-; 0x854e
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/sfx_02_48.asm
@@ -8,4 +8,3 @@
unknownsfx0x20 15, 23, 0, 4
unknownsfx0x10 8
endchannel
-; 0x8569
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/sfx_02_49.asm
@@ -6,4 +6,3 @@
unknownsfx0x20 4, 241, 128, 7
unknownsfx0x20 4, 0, 0, 0
endchannel
-; 0x8580
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/sfx_02_4a.asm
@@ -7,4 +7,3 @@
unknownsfx0x10 8
unknownsfx0x20 1, 0, 0, 0
endchannel
-; 0x8595
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/sfx_02_4b.asm
@@ -8,4 +8,3 @@
unknownsfx0x20 15, 23, 0, 7
unknownsfx0x10 8
endchannel
-; 0x85b0
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/sfx_02_4c.asm
@@ -8,4 +8,3 @@
unknownsfx0x20 15, 23, 0, 5
unknownsfx0x10 8
endchannel
-; 0x85cb
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/sfx_02_4d.asm
@@ -4,4 +4,3 @@
unknownsfx0x20 15, 210, 0, 5
unknownsfx0x10 8
endchannel
-; 0x85d6
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/sfx_02_4e.asm
@@ -4,4 +4,3 @@
unknownsfx0x20 15, 242, 0, 4
unknownsfx0x10 8
endchannel
-; 0x85e1
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/sfx_02_4f.asm
@@ -4,4 +4,3 @@
unknownnoise0x20 2, 241, 34
unknownnoise0x20 1, 0, 0
endchannel
-; 0x85ee
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/sfx_02_50.asm
@@ -16,4 +16,3 @@
unknownnoise0x20 2, 65, 18
unknownnoise0x20 2, 0, 0
endchannel
-; 0x861f
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/sfx_02_51.asm
@@ -16,4 +16,3 @@
unknownsfx0x20 15, 240, 1, 4
unknownsfx0x20 1, 0, 0, 0
endchannel
-; 0x8649
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/sfx_02_52.asm
@@ -4,4 +4,3 @@
unknownsfx0x20 15, 210, 0, 7
unknownsfx0x10 8
endchannel
-; 0x8654
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/sfx_02_53.asm
@@ -8,4 +8,3 @@
unknownnoise0x20 8, 244, 85
unknownnoise0x20 8, 241, 68
endchannel
-; 0x866d
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/sfx_02_54.asm
@@ -20,4 +20,3 @@
unknownsfx0x20 15, 240, 130, 4
unknownsfx0x20 15, 242, 130, 4
endchannel
-; 0x86ab
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/sfx_02_55.asm
@@ -10,4 +10,3 @@
unknownsfx0x20 15, 226, 0, 7
unknownsfx0x10 8
endchannel
-; 0x86c8
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/sfx_02_56.asm
@@ -5,4 +5,3 @@
unknownnoise0x20 8, 244, 85
unknownnoise0x20 8, 241, 68
endchannel
-; 0x83f1
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/sfx_02_57.asm
@@ -2,4 +2,3 @@
unknownnoise0x20 9, 241, 68
unknownnoise0x20 8, 209, 67
endchannel
-; 0x83f8
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/sfx_02_58.asm
@@ -9,4 +9,3 @@
unknownsfx0x20 2, 8, 0, 0
unknownsfx0x20 8, 177, 65, 7
endchannel
-; 0x840a
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/sfx_02_59.asm
@@ -9,4 +9,3 @@
unknownsfx0x20 1, 8, 0, 0
unknownsfx0x20 4, 161, 97, 7
endchannel
-; 0x842d
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/sfx_02_5a.asm
@@ -11,4 +11,3 @@
unknownsfx0x20 4, 145, 193, 6
unknownsfx0x20 8, 162, 161, 7
endchannel
-; 0x8447
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/sfx_02_5b.asm
@@ -4,4 +4,3 @@
unknownsfx0x20 15, 241, 0, 3
unknownsfx0x10 8
endchannel
-; 0x8452
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/sfx_02_5c.asm
@@ -5,4 +5,3 @@
unknownnoise0x20 12, 97, 35
unknownnoise0x20 6, 65, 84
endchannel
-; 0x8462
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/sfx_02_5d.asm
@@ -21,4 +21,3 @@
unknownsfx0x20 2, 196, 161, 7
unknownsfx0x20 15, 210, 225, 7
endchannel
-; 0x84b7
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
@@ -19,4 +19,3 @@
G_ 8
rest 12
endchannel
-; 0x83e1
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/sfx_02_5f.asm
@@ -7,4 +7,3 @@
unknownsfx0x20 15, 68, 0, 7
unknownsfx0x20 15, 36, 0, 7
endchannel
-; 0x86e3
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/sfx_02_unused.asm
@@ -29,4 +29,3 @@
unknownnoise0x20 12, 125, 76
unknownnoise0x20 15, 211, 76
endchannel
-; 0x872f