mirror of
https://github.com/pret/pokeyellow.git
synced 2024-12-02 16:06:53 +00:00
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
This commit is contained in:
U-Daniel-PC\Daniel
parent
f4a31b3e0b
commit
fc9b61e8ac
@ -443,7 +443,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81
|
||||
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 @@ Music8_OverwriteChannelPointer: ; 2231d (8:631d)
|
||||
|
||||
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
|
||||
|
||||
@ -141,14 +141,14 @@ Music2_ApplyMusicAffects: ; 0x9138
|
||||
.done
|
||||
ld d, a
|
||||
ld b, $3
|
||||
call Func_9838
|
||||
call Music2_9838
|
||||
ld [hl], d
|
||||
ret
|
||||
|
||||
; 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 @@ Music2_endchannel: ; 0x91e6
|
||||
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 @@ Music2_pitchbend: ; 0x936d
|
||||
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 @@ Music2_stereopanning: ; 0x93fa
|
||||
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 @@ Music2_unknownsfx0x20: ; 0x9472
|
||||
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 @@ Music2_unknownsfx0x20: ; 0x9472
|
||||
.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 @@ asm_94fd
|
||||
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 @@ Music2_notelength: ; 0x950a
|
||||
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 @@ Music2_notelength: ; 0x950a
|
||||
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 @@ Music2_notelength: ; 0x950a
|
||||
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 @@ Music2_notepitch: ; 0x9568
|
||||
jr .done
|
||||
.notSfxChannel3
|
||||
ld b, $2
|
||||
call Func_9838
|
||||
call Music2_9838
|
||||
ld a, $8
|
||||
ld [hli], a
|
||||
inc hl
|
||||
@ -758,13 +758,13 @@ Music2_notepitch: ; 0x9568
|
||||
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 @@ Music2_notepitch: ; 0x9568
|
||||
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 @@ Music2_notepitch: ; 0x9568
|
||||
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 @@ Func_95f8: ; 0x95f8
|
||||
ld [$ff25], a
|
||||
ret
|
||||
|
||||
Func_9629: ; 0x9629
|
||||
Music2_9629: ; 0x9629
|
||||
ld b, $0
|
||||
ld hl, wc0b6
|
||||
add hl, bc
|
||||
@ -861,11 +861,11 @@ Func_9629: ; 0x9629
|
||||
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 @@ Func_964b: ; 0x964b
|
||||
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 @@ Func_9693: ; 0x9693
|
||||
.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 @@ Func_96b5: ; 0x96b5
|
||||
.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 @@ Func_96c7: ; 0x96c7
|
||||
ccf
|
||||
ret
|
||||
|
||||
Func_96e5: ; 0x96e5
|
||||
Music2_96e5: ; 0x96e5
|
||||
ld a, [wc02a]
|
||||
cp $14
|
||||
jr nc, .asm_96ee
|
||||
@ -1083,7 +1083,7 @@ Music2_ApplyPitchBend: ; 0x96f9
|
||||
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 @@ Music2_ApplyPitchBend: ; 0x96f9
|
||||
res 5, [hl]
|
||||
ret
|
||||
|
||||
Func_978f: ; 0x978f
|
||||
Music2_978f: ; 0x978f
|
||||
ld hl, wc096
|
||||
add hl, bc
|
||||
ld [hl], d
|
||||
@ -1195,7 +1195,7 @@ Music2_ApplyDutyCycle: ; 0x980d
|
||||
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 @@ Music2_GetNextMusicByte: ; 0x9825
|
||||
ld [hl], d
|
||||
ret
|
||||
|
||||
Func_9838: ; 0x9838
|
||||
Music2_9838: ; 0x9838
|
||||
ld a, c
|
||||
ld hl, Unknown_9b17
|
||||
add l
|
||||
@ -1234,7 +1234,7 @@ Func_9838: ; 0x9838
|
||||
ld h, $ff
|
||||
ret
|
||||
|
||||
Func_9847: ; 0x9847
|
||||
Music2_9847: ; 0x9847
|
||||
ld h, $0
|
||||
.loop
|
||||
srl a
|
||||
@ -1249,7 +1249,7 @@ Func_9847: ; 0x9847
|
||||
.done
|
||||
ret
|
||||
|
||||
Func_9858: ; 0x9858
|
||||
Music2_9858: ; 0x9858
|
||||
ld h, $0
|
||||
ld l, a
|
||||
add hl, hl
|
||||
@ -1274,16 +1274,16 @@ Func_9858: ; 0x9858
|
||||
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 @@ Func_9876:: ; 0x9876
|
||||
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 @@ Func_994e: ; 0x994e
|
||||
.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 @@ FillMusicRAM2: ; 0x9a89
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
Func_9a8f: ; 0x9a8f
|
||||
Music2_9a8f: ; 0x9a8f
|
||||
ld a, [wc001]
|
||||
ld l, a
|
||||
ld e, a
|
||||
|
||||
@ -141,7 +141,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
|
||||
.done
|
||||
ld d, a
|
||||
ld b, $3
|
||||
call Func_21ff7
|
||||
call Music8_21ff7
|
||||
ld [hl], d
|
||||
ret
|
||||
|
||||
@ -245,7 +245,7 @@ Music8_endchannel: ; 21967 (8:5967)
|
||||
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 @@ Music8_pitchbend: ; 21aee (8:5aee)
|
||||
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 @@ Music8_unknownmusic0xef: ; 21b88 (8:5b88)
|
||||
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 @@ Music8_unknownsfx0x20: ; 21bf3
|
||||
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 @@ Music8_unknownsfx0x20: ; 21bf3
|
||||
.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 @@ asm_21c7e
|
||||
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 @@ Music8_notelength: ; 21c8b (8:5c8b)
|
||||
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 @@ Music8_notelength: ; 21c8b (8:5c8b)
|
||||
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 @@ Music8_notelength: ; 21c8b (8:5c8b)
|
||||
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 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
|
||||
jr .done
|
||||
.notSfxChannel3
|
||||
ld b, $2
|
||||
call Func_21ff7
|
||||
call Music8_21ff7
|
||||
ld a, $8
|
||||
ld [hli], a
|
||||
inc hl
|
||||
@ -765,13 +765,13 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
|
||||
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 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
|
||||
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 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
|
||||
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 @@ Func_21d79: ; 21d79 (8:5d79)
|
||||
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 @@ Func_21daa: ; 21daa (8:5daa)
|
||||
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,18 +916,18 @@ Func_21dcc: ; 21dcc (8:5dcc)
|
||||
and $c7
|
||||
ld d, a
|
||||
ld b, $3
|
||||
call Func_21ff7
|
||||
call Music8_21ff7
|
||||
ld [hl], e
|
||||
inc hl
|
||||
ld [hl], d
|
||||
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 @@ Func_21e19: ; 21e19 (8:5e19)
|
||||
.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 @@ Func_21e2f: ; 21e2f (8:5e2f)
|
||||
.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 @@ Func_21e56: ; 21e56 (8:5e56)
|
||||
.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 @@ Func_21e6d: ; 21e6d (8:5e6d)
|
||||
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 @@ Func_21e8b: ; 21e8b (8:5e8b)
|
||||
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 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
|
||||
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 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
|
||||
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 @@ Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
|
||||
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 @@ Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
|
||||
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 @@ Func_21ff7: ; 21ff7 (8:5ff7)
|
||||
ld h, $ff
|
||||
ret
|
||||
|
||||
Func_22006: ; 22006 (8:6006)
|
||||
Music8_22006: ; 22006 (8:6006)
|
||||
ld h, $0
|
||||
.loop
|
||||
srl a
|
||||
@ -1300,7 +1300,7 @@ Func_22006: ; 22006 (8:6006)
|
||||
.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 @@ Func_22017: ; 22017 (8:6017)
|
||||
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 @@ Func_22035:: ; 22035 (8:6035)
|
||||
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 @@ Func_2210d: ; 2210d (8:610d)
|
||||
.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 @@ FillMusicRAM8: ; 22248 (8:6248)
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
Func_2224e: ; 2224e (8:624e)
|
||||
Music8_2224e: ; 2224e (8:624e)
|
||||
ld a, [wc001]
|
||||
ld l, a
|
||||
ld e, a
|
||||
|
||||
@ -141,7 +141,7 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
|
||||
.done
|
||||
ld d, a
|
||||
ld b, $3
|
||||
call Func_7d8ac
|
||||
call Music1f_7d8ac
|
||||
ld [hl], d
|
||||
ret
|
||||
|
||||
@ -238,7 +238,7 @@ Music1f_endchannel: ; 7d25a (1f:525a)
|
||||
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 @@ Music1f_pitchbend: ; 7d3e1 (1f:53e1)
|
||||
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 @@ Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
|
||||
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 @@ Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
|
||||
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 @@ Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
|
||||
.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 @@ asm_7d571
|
||||
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 @@ Music1f_notelength: ; 7d57e (1f:557e)
|
||||
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 @@ Music1f_notelength: ; 7d57e (1f:557e)
|
||||
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 @@ Music1f_notelength: ; 7d57e (1f:557e)
|
||||
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 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
|
||||
jr .quit
|
||||
.notSfxChannel3
|
||||
ld b, $2
|
||||
call Func_7d8ac
|
||||
call Music1f_7d8ac
|
||||
ld a, $8
|
||||
ld [hli], a
|
||||
inc hl
|
||||
@ -758,13 +758,13 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
|
||||
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 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
|
||||
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 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
|
||||
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 @@ Func_7d66c: ; 7d66c (1f:566c)
|
||||
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 @@ Func_7d69d: ; 7d69d (1f:569d)
|
||||
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 @@ Func_7d6bf: ; 7d6bf (1f:56bf)
|
||||
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 @@ Func_7d707: ; 7d707 (1f:5707)
|
||||
.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 @@ Func_7d729: ; 7d729 (1f:5729)
|
||||
.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 @@ Func_7d73b: ; 7d73b (1f:573b)
|
||||
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 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
|
||||
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 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
|
||||
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 @@ Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
|
||||
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 @@ Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
|
||||
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 @@ Func_7d8ac: ; 7d8ac (1f:58ac)
|
||||
ld h, $ff
|
||||
ret
|
||||
|
||||
Func_7d8bb: ; 7d8bb (1f:58bb)
|
||||
Music1f_7d8bb: ; 7d8bb (1f:58bb)
|
||||
ld h, $0
|
||||
.loop
|
||||
srl a
|
||||
@ -1249,7 +1249,7 @@ Func_7d8bb: ; 7d8bb (1f:58bb)
|
||||
.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 @@ Func_7d8cc: ; 7d8cc (1f:58cc)
|
||||
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 @@ Func_7d8ea:: ; 7d8ea (1f:58ea)
|
||||
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 @@ Func_7d9c2: ; 7d9c2 (1f:59c2)
|
||||
.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 @@ FillMusicRAM1f: ; 7dafd (1f:5afd)
|
||||
jr nz, .loop
|
||||
ret
|
||||
|
||||
Func_7db03: ; 7db03 (1f:5b03)
|
||||
Music1f_7db03: ; 7db03 (1f:5b03)
|
||||
ld a, [wc001]
|
||||
ld l, a
|
||||
ld e, a
|
||||
|
||||
@ -182,5 +182,3 @@ Music_IndigoPlateau:: ; 82f1 (2:42f1)
|
||||
dw Music_IndigoPlateau_Ch3
|
||||
db CH3
|
||||
dw Music_IndigoPlateau_Ch4
|
||||
|
||||
; 0x82fd
|
||||
|
||||
@ -156,5 +156,3 @@ Music_MeetMaleTrainer:: ; 7c2f4 (1f:42f4)
|
||||
dw Music_MeetMaleTrainer_Ch2
|
||||
db CH2
|
||||
dw Music_MeetMaleTrainer_Ch3
|
||||
|
||||
; 0x7c2fd
|
||||
|
||||
@ -560,5 +560,3 @@ SFX_02_5e:: ; 8228 (2:4228)
|
||||
SFX_02_5f:: ; 822b (2:422b)
|
||||
db CH4
|
||||
dw SFX_02_5f_Ch1
|
||||
|
||||
; 0x822e
|
||||
|
||||
@ -704,5 +704,3 @@ SFX_08_76:: ; 202b2 (8:42b2)
|
||||
SFX_08_77:: ; 202bb (8:42bb)
|
||||
db CH4
|
||||
dw SFX_08_77_Ch1
|
||||
|
||||
; 0x202be
|
||||
|
||||
@ -594,5 +594,3 @@ SFX_1f_66:: ; 7c240 (1f:4240)
|
||||
SFX_1f_67:: ; 7c246 (1f:4246)
|
||||
db CH4
|
||||
dw SFX_1f_67_Ch1
|
||||
|
||||
; 0x7c249
|
||||
|
||||
@ -702,4 +702,3 @@ Music_BikeRiding_branch_7dec2::
|
||||
triangle3 1
|
||||
triangle3 1
|
||||
endchannel
|
||||
; 0x7ded1
|
||||
|
||||
@ -409,4 +409,3 @@ Music_Celadon_branch_b7c1::
|
||||
F# 2
|
||||
E_ 2
|
||||
loopchannel 0, Music_Celadon_branch_b7c1
|
||||
; 0xb86d
|
||||
|
||||
@ -352,4 +352,3 @@ Music_Cinnabar_branch_b93f::
|
||||
C_ 1
|
||||
rest 1
|
||||
loopchannel 0, Music_Cinnabar_branch_b93f
|
||||
; 0xb9eb
|
||||
|
||||
@ -170,4 +170,3 @@ Music_CinnabarMansion_branch_7edb5::
|
||||
rest 8
|
||||
cymbal3 8
|
||||
loopchannel 0, Music_CinnabarMansion_branch_7edb5
|
||||
; 0x7edda
|
||||
|
||||
@ -655,4 +655,3 @@ Music_Cities1_branch_ad6e::
|
||||
triangle2 2
|
||||
triangle2 2
|
||||
endchannel
|
||||
; 0xad77
|
||||
|
||||
@ -414,4 +414,3 @@ Music_Cities2_branch_b64c::
|
||||
E_ 2
|
||||
G# 2
|
||||
loopchannel 0, Music_Cities2_branch_b64c
|
||||
; 0xb6c7
|
||||
|
||||
@ -818,4 +818,3 @@ Music_Credits_branch_7ffed::
|
||||
A_ 1
|
||||
rest 3
|
||||
endchannel
|
||||
; 0x7fffa
|
||||
|
||||
@ -605,4 +605,3 @@ Music_DefeatedGymLeader_branch_23e65::
|
||||
G_ 2
|
||||
E_ 2
|
||||
loopchannel 0, Music_DefeatedGymLeader_branch_23e65
|
||||
; 0x23f52
|
||||
|
||||
@ -264,4 +264,3 @@ Music_DefeatedTrainer_branch_23b24::
|
||||
octave 4
|
||||
A_ 3
|
||||
loopchannel 0, Music_DefeatedTrainer_branch_23b24
|
||||
; 0x23b74
|
||||
|
||||
@ -300,4 +300,3 @@ Music_DefeatedWildMon_branch_23c21::
|
||||
octave 4
|
||||
D# 4
|
||||
loopchannel 0, Music_DefeatedWildMon_branch_23c21
|
||||
; 0x23cad
|
||||
|
||||
@ -673,4 +673,3 @@ Music_Dungeon1_branch_7e202::
|
||||
snare8 4
|
||||
snare9 4
|
||||
endchannel
|
||||
; 0x7e20b
|
||||
|
||||
@ -315,4 +315,3 @@ Music_Dungeon2_branch_7e9dd::
|
||||
snare9 4
|
||||
snare7 4
|
||||
loopchannel 0, Music_Dungeon2_branch_7e9dd
|
||||
; 0x7e9f1
|
||||
|
||||
@ -754,4 +754,3 @@ Music_Dungeon3_Ch4:: ; 7ece4 (1f:6ce4)
|
||||
rest 16
|
||||
rest 10
|
||||
endchannel
|
||||
; 0x7ed0f
|
||||
|
||||
@ -1342,4 +1342,3 @@ Music_FinalBattle_branch_2396c::
|
||||
octave 5
|
||||
E_ 2
|
||||
endchannel
|
||||
; 0x2397d
|
||||
|
||||
@ -625,4 +625,3 @@ Music_GameCorner_branch_7e4ab::
|
||||
A_ 1
|
||||
rest 1
|
||||
endchannel
|
||||
; 0x7e4c0
|
||||
|
||||
@ -355,4 +355,3 @@ Music_Gym_branch_be4d::
|
||||
F_ 2
|
||||
A# 2
|
||||
endchannel
|
||||
; 0xbe56
|
||||
|
||||
@ -1398,4 +1398,3 @@ Music_GymLeaderBattle_branch_227b1::
|
||||
octave 4
|
||||
G_ 6
|
||||
loopchannel 0, Music_GymLeaderBattle_branch_227b1
|
||||
; 0x22919
|
||||
|
||||
@ -94,4 +94,3 @@ Music_HallOfFame_branch_7fbfe::
|
||||
E_ 4
|
||||
G_ 4
|
||||
loopchannel 0, Music_HallOfFame_Ch3
|
||||
; 0x7fc1f
|
||||
|
||||
@ -319,4 +319,3 @@ Music_IndigoPlateau_branch_a7a8::
|
||||
mutedsnare3 1
|
||||
mutedsnare3 1
|
||||
endchannel
|
||||
; 0xa7c5
|
||||
|
||||
@ -327,4 +327,3 @@ Music_IntroBattle_Ch4:: ; 7f95b (1f:795b)
|
||||
rest 16
|
||||
rest 14
|
||||
endchannel
|
||||
; 0x7fa19
|
||||
|
||||
@ -38,4 +38,3 @@ Music_JigglypuffSong_Ch2:: ; 7fb9a (1f:7b9a)
|
||||
G# 4
|
||||
E_ 10
|
||||
endchannel
|
||||
; 0x7fbaf
|
||||
|
||||
@ -197,4 +197,3 @@ Music_Lavender_branch_bc26::
|
||||
triangle2 8
|
||||
triangle2 8
|
||||
loopchannel 0, Music_Lavender_branch_bc26
|
||||
; 0xbc2e
|
||||
|
||||
@ -78,4 +78,3 @@ Music_MeetEvilTrainer_branch_7f6ee::
|
||||
rest 3
|
||||
A# 4
|
||||
loopchannel 0, Music_MeetEvilTrainer_branch_7f6ee
|
||||
; 0x7f6f9
|
||||
|
||||
@ -116,4 +116,3 @@ Music_MeetFemaleTrainer_branch_7f770::
|
||||
F# 1
|
||||
rest 1
|
||||
endchannel
|
||||
; 0x7f77b
|
||||
|
||||
@ -188,4 +188,3 @@ Music_MeetMaleTrainer_branch_7f7ea::
|
||||
D# 1
|
||||
rest 1
|
||||
loopchannel 0, Music_MeetMaleTrainer_branch_7f7ea
|
||||
; 0x7f844
|
||||
|
||||
@ -421,4 +421,3 @@ Music_MeetProfOak_branch_b101::
|
||||
rest 1
|
||||
loopchannel 2, Music_MeetProfOak_branch_b101
|
||||
loopchannel 0, Music_MeetProfOak_branch_b0bc
|
||||
; 0xb119
|
||||
|
||||
@ -394,4 +394,3 @@ Music_MeetRival_branch_b2b5::
|
||||
G_ 1
|
||||
rest 1
|
||||
loopchannel 0, Music_MeetRival_branch_b24b
|
||||
; 0xb2c8
|
||||
|
||||
@ -335,4 +335,3 @@ Music_MuseumGuy_branch_aee1::
|
||||
mutedsnare3 1
|
||||
mutedsnare3 1
|
||||
loopchannel 0, Music_MuseumGuy_branch_aee1
|
||||
; 0xaf59
|
||||
|
||||
@ -391,4 +391,3 @@ Music_OaksLab_branch_7ef5c::
|
||||
E_ 1
|
||||
rest 3
|
||||
loopchannel 0, Music_OaksLab_branch_7ef5c
|
||||
; 0x7f04a
|
||||
|
||||
@ -312,4 +312,3 @@ Music_PalletTown_branch_a8e3::
|
||||
F# 8
|
||||
loopchannel 0, Music_PalletTown_branch_a8e3
|
||||
endchannel
|
||||
; 0xa913
|
||||
|
||||
@ -45,4 +45,3 @@ Music_PkmnHealed_Ch3:: ; 9bd2 (2:5bd2)
|
||||
E_ 6
|
||||
rest 2
|
||||
endchannel
|
||||
; 0x9bde
|
||||
|
||||
@ -373,4 +373,3 @@ Music_Pokecenter_branch_bfeb::
|
||||
F# 2
|
||||
A_ 2
|
||||
endchannel
|
||||
; 0xbff4
|
||||
|
||||
@ -456,4 +456,3 @@ Music_PokemonTower_branch_7f1a2::
|
||||
D# 1
|
||||
rest 1
|
||||
loopchannel 0, Music_PokemonTower_branch_7f1a2
|
||||
; 0x7f243
|
||||
|
||||
@ -402,4 +402,3 @@ Music_Routes1_Ch4:: ; 9d24 (2:5d24)
|
||||
mutedsnare1 2
|
||||
loopchannel 0, Music_Routes1_Ch4
|
||||
endchannel
|
||||
; 0x9db9
|
||||
|
||||
@ -423,4 +423,3 @@ Music_Routes2_Ch4:: ; 9f08 (2:5f08)
|
||||
rest 3
|
||||
loopchannel 0, Music_Routes2_Ch4
|
||||
endchannel
|
||||
; 0x9fad
|
||||
|
||||
@ -513,4 +513,3 @@ Music_Routes3_branch_a17a::
|
||||
mutedsnare3 1
|
||||
mutedsnare3 1
|
||||
loopchannel 0, Music_Routes3_branch_a17a
|
||||
; 0xa26a
|
||||
|
||||
@ -679,4 +679,3 @@ Music_Routes4_branch_a4a8::
|
||||
mutedsnare2 2
|
||||
mutedsnare2 2
|
||||
loopchannel 0, Music_Routes4_branch_a4a8
|
||||
; 0xa5f0
|
||||
|
||||
@ -109,4 +109,3 @@ Music_SafariZone_branch_bca5::
|
||||
A_ 2
|
||||
rest 2
|
||||
endchannel
|
||||
; 0xbcbb
|
||||
|
||||
@ -998,4 +998,3 @@ Music_SilphCo_branch_7f5c9::
|
||||
E_ 4
|
||||
F_ 4
|
||||
loopchannel 0, Music_SilphCo_branch_7f5c9
|
||||
; 0x7f69d
|
||||
|
||||
@ -336,4 +336,3 @@ Music_SSAnne_Ch3:: ; b4cb (2:74cb)
|
||||
G# 8
|
||||
B_ 8
|
||||
loopchannel 0, Music_SSAnne_Ch3
|
||||
; 0xb504
|
||||
|
||||
@ -333,4 +333,3 @@ Music_Surfing_branch_7fb03::
|
||||
D_ 2
|
||||
E_ 2
|
||||
loopchannel 0, Music_Surfing_branch_7fb03
|
||||
; 0x7fb7d
|
||||
|
||||
@ -675,4 +675,3 @@ Music_TitleScreen_branch_7e842::
|
||||
snare2 1
|
||||
rest 3
|
||||
endchannel
|
||||
; 0x7e850
|
||||
|
||||
@ -1855,4 +1855,3 @@ Music_TrainerBattle_branch_22d9c::
|
||||
D_ 2
|
||||
C_ 2
|
||||
loopchannel 0, Music_TrainerBattle_branch_22d9c
|
||||
; 0x23099
|
||||
|
||||
@ -336,4 +336,3 @@ Music_UnusedSong_branch_a9d8::
|
||||
rest 6
|
||||
loopchannel 0, Music_UnusedSong_branch_a9d8
|
||||
endchannel
|
||||
; 0xaa6f
|
||||
|
||||
@ -321,4 +321,3 @@ Music_Vermilion_branch_bb3f::
|
||||
triangle1 1
|
||||
triangle1 1
|
||||
endchannel
|
||||
; 0xbb58
|
||||
|
||||
@ -736,4 +736,3 @@ Music_WildBattle_branch_232d8::
|
||||
C# 2
|
||||
G# 2
|
||||
loopchannel 0, Music_WildBattle_branch_232d8
|
||||
; 0x233a6
|
||||
|
||||
@ -307,4 +307,3 @@ Music_MeetJessieJames_branch_83235::
|
||||
rest 1
|
||||
loopchannel 0, Music_MeetJessieJames_branch_83235
|
||||
endchannel
|
||||
; 0x832ba
|
||||
|
||||
@ -688,4 +688,3 @@ Music_SurfingPikachu_branch_82ea0::
|
||||
D# 1
|
||||
rest 1
|
||||
loopchannel 0, Music_SurfingPikachu_branch_82ea0
|
||||
; 0x82fbe
|
||||
|
||||
@ -482,4 +482,3 @@ Music_YellowIntro_Ch3:: ; 7f749 (1f:7749)
|
||||
E_ 1
|
||||
rest 15
|
||||
endchannel
|
||||
; 0x7f860
|
||||
|
||||
@ -324,4 +324,3 @@ Music_YellowUnusedSong_branch_830c3::
|
||||
snare3 4
|
||||
snare3 4
|
||||
loopchannel 0, Music_YellowUnusedSong_branch_830c3
|
||||
; 0x8316d
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_01_Ch1: ; 82fd (2:42fd)
|
||||
unknownnoise0x20 0, 193, 51
|
||||
endchannel
|
||||
; 0x8301
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_02_Ch1: ; 8301 (2:4301)
|
||||
unknownnoise0x20 0, 177, 51
|
||||
endchannel
|
||||
; 0x8305
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_03_Ch1: ; 8305 (2:4305)
|
||||
unknownnoise0x20 0, 161, 51
|
||||
endchannel
|
||||
; 0x8309
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_04_Ch1: ; 8309 (2:4309)
|
||||
unknownnoise0x20 0, 129, 51
|
||||
endchannel
|
||||
; 0x830d
|
||||
|
||||
@ -6,4 +6,3 @@ SFX_02_05_Ch1: ; 830d (2:430d)
|
||||
unknownnoise0x20 3, 130, 51
|
||||
unknownnoise0x20 2, 129, 50
|
||||
endchannel
|
||||
; 0x8320
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_06_Ch1: ; 8320 (2:4320)
|
||||
unknownnoise0x20 0, 81, 42
|
||||
endchannel
|
||||
; 0x8324
|
||||
|
||||
@ -2,4 +2,3 @@ SFX_02_07_Ch1: ; 8324 (2:4324)
|
||||
unknownnoise0x20 1, 65, 43
|
||||
unknownnoise0x20 0, 97, 42
|
||||
endchannel
|
||||
; 0x832b
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_08_Ch1: ; 832b (2:432b)
|
||||
unknownnoise0x20 0, 129, 16
|
||||
endchannel
|
||||
; 0x832f
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_09_Ch1: ; 832f (2:432f)
|
||||
unknownnoise0x20 0, 130, 35
|
||||
endchannel
|
||||
; 0x8333
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_0a_Ch1: ; 8333 (2:4333)
|
||||
unknownnoise0x20 0, 130, 37
|
||||
endchannel
|
||||
; 0x8337
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_0b_Ch1: ; 8337 (2:4337)
|
||||
unknownnoise0x20 0, 130, 38
|
||||
endchannel
|
||||
; 0x833b
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_0c_Ch1: ; 833b (2:433b)
|
||||
unknownnoise0x20 0, 161, 16
|
||||
endchannel
|
||||
; 0x833f
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_0d_Ch1: ; 833f (2:433f)
|
||||
unknownnoise0x20 0, 162, 17
|
||||
endchannel
|
||||
; 0x8343
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_0e_Ch1: ; 8343 (2:4343)
|
||||
unknownnoise0x20 0, 162, 80
|
||||
endchannel
|
||||
; 0x8347
|
||||
|
||||
@ -2,4 +2,3 @@ SFX_02_0f_Ch1: ; 8347 (2:4347)
|
||||
unknownnoise0x20 0, 161, 24
|
||||
unknownnoise0x20 0, 49, 51
|
||||
endchannel
|
||||
; 0x834e
|
||||
|
||||
@ -2,4 +2,3 @@ SFX_02_10_Ch1: ; 834e (2:434e)
|
||||
unknownnoise0x20 2, 145, 40
|
||||
unknownnoise0x20 0, 113, 24
|
||||
endchannel
|
||||
; 0x8355
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_11_Ch1: ; 8355 (2:4355)
|
||||
unknownnoise0x20 0, 145, 34
|
||||
endchannel
|
||||
; 0x8359
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_12_Ch1: ; 8359 (2:4359)
|
||||
unknownnoise0x20 0, 113, 34
|
||||
endchannel
|
||||
; 0x835d
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
SFX_02_13_Ch1: ; 835d (2:435d)
|
||||
unknownnoise0x20 0, 97, 34
|
||||
endchannel
|
||||
; 0x8361
|
||||
|
||||
@ -19,4 +19,3 @@ SFX_02_14_Ch3: ; 89a5 (2:49a5)
|
||||
unknownnoise0x20 14, 148, 44
|
||||
unknownnoise0x20 8, 129, 28
|
||||
endchannel
|
||||
; 0x89af
|
||||
|
||||
@ -22,4 +22,3 @@ SFX_02_15_Ch3: ; 8bbd (2:4bbd)
|
||||
unknownnoise0x20 3, 130, 28
|
||||
unknownnoise0x20 8, 113, 44
|
||||
endchannel
|
||||
; 0x8bca
|
||||
|
||||
@ -15,4 +15,3 @@ SFX_02_16_Ch2: ; 8b1b (2:4b1b)
|
||||
|
||||
SFX_02_16_Ch3: ; 8b29 (2:4b29)
|
||||
endchannel
|
||||
; 0x8b2a
|
||||
|
||||
@ -28,4 +28,3 @@ SFX_02_17_Ch3: ; 88e4 (2:48e4)
|
||||
unknownnoise0x20 12, 182, 76
|
||||
unknownnoise0x20 15, 162, 92
|
||||
endchannel
|
||||
; 0x88f1
|
||||
|
||||
@ -30,4 +30,3 @@ SFX_02_18_Ch3: ; 8c93 (2:4c93)
|
||||
unknownnoise0x20 7, 195, 76
|
||||
unknownnoise0x20 8, 161, 92
|
||||
endchannel
|
||||
; 0x8ca6
|
||||
|
||||
@ -17,4 +17,3 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
|
||||
|
||||
SFX_02_19_Ch3: ; 8a5a (2:4a5a)
|
||||
endchannel
|
||||
; 0x8a5b
|
||||
|
||||
@ -20,4 +20,3 @@ SFX_02_1a_Ch3: ; 89fa (2:49fa)
|
||||
unknownnoise0x20 15, 215, 156
|
||||
unknownnoise0x20 15, 242, 172
|
||||
endchannel
|
||||
; 0x8a0d
|
||||
|
||||
@ -19,4 +19,3 @@ SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
|
||||
unknownnoise0x20 15, 230, 76
|
||||
unknownnoise0x20 8, 177, 92
|
||||
endchannel
|
||||
; 0x8a35
|
||||
|
||||
@ -21,4 +21,3 @@ SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
|
||||
unknownnoise0x20 11, 215, 92
|
||||
unknownnoise0x20 15, 194, 76
|
||||
endchannel
|
||||
; 0x8c55
|
||||
|
||||
@ -33,4 +33,3 @@ SFX_02_1d_Ch3: ; 876d (2:476d)
|
||||
unknownnoise0x20 6, 212, 61
|
||||
unknownnoise0x20 8, 193, 59
|
||||
endchannel
|
||||
; 0x8786
|
||||
|
||||
@ -33,4 +33,3 @@ SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
|
||||
unknownnoise0x20 3, 164, 44
|
||||
unknownnoise0x20 8, 145, 60
|
||||
endchannel
|
||||
; 0x8c25
|
||||
|
||||
@ -35,4 +35,3 @@ SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
|
||||
unknownnoise0x20 4, 193, 44
|
||||
unknownnoise0x20 8, 161, 76
|
||||
endchannel
|
||||
; 0x8abe
|
||||
|
||||
@ -27,4 +27,3 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
|
||||
|
||||
SFX_02_20_Ch3: ; 8b0b (2:4b0b)
|
||||
endchannel
|
||||
; 0x8b0c
|
||||
|
||||
@ -38,4 +38,3 @@ SFX_02_21_Ch3: ; 8b78 (2:4b78)
|
||||
unknownnoise0x20 9, 194, 44
|
||||
unknownnoise0x20 4, 161, 60
|
||||
endchannel
|
||||
; 0x8b97
|
||||
|
||||
@ -21,4 +21,3 @@ SFX_02_22_Ch3: ; 89d5 (2:49d5)
|
||||
unknownnoise0x20 2, 97, 33
|
||||
unknownnoise0x20 8, 97, 17
|
||||
endchannel
|
||||
; 0x89df
|
||||
|
||||
@ -27,4 +27,3 @@ SFX_02_23_Ch3: ; 8927 (2:4927)
|
||||
unknownnoise0x20 8, 183, 92
|
||||
unknownnoise0x20 15, 194, 93
|
||||
endchannel
|
||||
; 0x8937
|
||||
|
||||
@ -29,4 +29,3 @@ SFX_02_24_Ch3: ; 897d (2:497d)
|
||||
unknownnoise0x20 4, 116, 16
|
||||
unknownnoise0x20 4, 113, 32
|
||||
endchannel
|
||||
; 0x8987
|
||||
|
||||
@ -32,4 +32,3 @@ SFX_02_25_Ch3: ; 8855 (2:4855)
|
||||
unknownnoise0x20 12, 210, 61
|
||||
unknownnoise0x20 8, 209, 44
|
||||
endchannel
|
||||
; 0x886b
|
||||
|
||||
@ -22,4 +22,3 @@ SFX_02_26_Ch3: ; 8d51 (2:4d51)
|
||||
unknownnoise0x20 3, 194, 108
|
||||
unknownnoise0x20 8, 209, 92
|
||||
endchannel
|
||||
; 0x8d5e
|
||||
|
||||
@ -28,4 +28,3 @@ SFX_02_27_Ch3: ; 8d94 (2:4d94)
|
||||
unknownnoise0x20 8, 179, 76
|
||||
unknownnoise0x20 8, 161, 92
|
||||
endchannel
|
||||
; 0x8da7
|
||||
|
||||
@ -19,4 +19,3 @@ SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
|
||||
unknownnoise0x20 14, 196, 60
|
||||
unknownnoise0x20 8, 209, 44
|
||||
endchannel
|
||||
; 0x8dcf
|
||||
|
||||
@ -28,4 +28,3 @@ SFX_02_29_Ch3: ; 8e6b (2:4e6b)
|
||||
unknownnoise0x20 3, 162, 92
|
||||
unknownnoise0x20 8, 177, 108
|
||||
endchannel
|
||||
; 0x8e7e
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user