mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
Cry "echo" is actually the upper byte of pitch (now a word).
This commit is contained in:
parent
2f99608526
commit
ab018a5094
File diff suppressed because it is too large
Load Diff
@ -828,7 +828,7 @@ Functione8466: ; e8466
|
||||
add hl, bc
|
||||
bit 4, [hl]
|
||||
jr z, .vibrato
|
||||
ld hl, $0027
|
||||
ld hl, Channel1CryPitch - Channel1
|
||||
add hl, bc
|
||||
ld e, [hl]
|
||||
inc hl
|
||||
@ -1758,7 +1758,7 @@ MusicE6: ; e88e4
|
||||
ld hl, Channel1Flags2 - Channel1
|
||||
add hl, bc
|
||||
set 4, [hl]
|
||||
ld hl, $0028
|
||||
ld hl, Channel1CryPitch + 1 - Channel1
|
||||
add hl, bc
|
||||
call GetMusicByte
|
||||
ld [hld], a
|
||||
@ -2367,7 +2367,6 @@ _PlayMusic:: ; e8b30
|
||||
PlayCry:: ; e8b79
|
||||
; Play cry de using parameters:
|
||||
; CryPitch
|
||||
; CryEcho
|
||||
; CryLength
|
||||
|
||||
call MusicOff
|
||||
@ -2416,7 +2415,7 @@ PlayCry:: ; e8b79
|
||||
add hl, bc
|
||||
ld a, [CryPitch]
|
||||
ld [hli], a
|
||||
ld a, [CryEcho]
|
||||
ld a, [CryPitch + 1]
|
||||
ld [hl], a
|
||||
|
||||
; No tempo for channel 4
|
||||
|
@ -1327,15 +1327,15 @@ BattleAnimCmd_E1: ; cc807 (33:4807)
|
||||
ld b, a
|
||||
|
||||
push hl
|
||||
ld hl, CryPitch ; $c2b0
|
||||
ld hl, CryPitch
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
add hl, bc
|
||||
ld a, l
|
||||
ld [CryPitch], a ; $c2b0
|
||||
ld [CryPitch], a
|
||||
ld a, h
|
||||
ld [CryEcho], a ; $c2b1
|
||||
ld [CryPitch + 1], a
|
||||
pop hl
|
||||
|
||||
ld a, [hli]
|
||||
@ -1363,11 +1363,11 @@ BattleAnimCmd_E1: ; cc807 (33:4807)
|
||||
; cc871 (33:4871)
|
||||
|
||||
Datacc871: ; cc871
|
||||
; +pitch, +echo, +length
|
||||
db $00, $00, $c0, $00
|
||||
db $00, $00, $40, $00
|
||||
db $00, $00, $00, $00
|
||||
db $00, $00, $00, $00
|
||||
; +pitch, +length
|
||||
dw 0, $c0
|
||||
dw 0, $40
|
||||
dw 0, $00
|
||||
dw 0, $00
|
||||
; cc881
|
||||
|
||||
|
||||
|
2
home.asm
2
home.asm
@ -1793,7 +1793,7 @@ Function37f3:: ; 37f3
|
||||
ld a, [hli]
|
||||
ld [CryPitch], a
|
||||
ld a, [hli]
|
||||
ld [CryEcho], a
|
||||
ld [CryPitch + 1], a
|
||||
ld a, [hli]
|
||||
ld [CryLength], a
|
||||
ld a, [hl]
|
||||
|
@ -173,7 +173,7 @@ PlayCryHeader:: ; 3be3
|
||||
ld a, [hli]
|
||||
ld [CryPitch], a
|
||||
ld a, [hli]
|
||||
ld [CryEcho], a
|
||||
ld [CryPitch + 1], a
|
||||
ld a, [hli]
|
||||
ld [CryLength], a
|
||||
ld a, [hl]
|
||||
|
6
main.asm
6
main.asm
@ -99732,12 +99732,12 @@ Functionfb841: ; fb841
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
ld l, a
|
||||
ld bc, $fec0
|
||||
ld bc, -$140
|
||||
add hl, bc
|
||||
ld a, l
|
||||
ld [CryPitch], a
|
||||
ld a, h
|
||||
ld [CryEcho], a
|
||||
ld [CryPitch + 1], a
|
||||
ld hl, CryLength
|
||||
ld a, [hli]
|
||||
ld h, [hl]
|
||||
@ -99747,7 +99747,7 @@ Functionfb841: ; fb841
|
||||
ld a, l
|
||||
ld [CryLength], a
|
||||
ld a, h
|
||||
ld [$c2b3], a
|
||||
ld [CryLength + 1], a
|
||||
callba PlayCry
|
||||
call WaitSFX
|
||||
|
||||
|
7
wram.asm
7
wram.asm
@ -107,8 +107,7 @@ channel_struct: MACRO
|
||||
ds 1 ; c125
|
||||
ds 1 ; c126
|
||||
ds 1 ; c127
|
||||
\1CryPitch:: db
|
||||
\1CryEcho:: db
|
||||
\1CryPitch:: dw
|
||||
ds 4
|
||||
\1NoteLength:: db ; frames per 16th note
|
||||
ds 1 ; c12f
|
||||
@ -227,9 +226,7 @@ MusicFadeIDHi:: ; c2aa
|
||||
ds 1
|
||||
ds 5
|
||||
CryPitch:: ; c2b0
|
||||
ds 1
|
||||
CryEcho:: ; c2b1
|
||||
ds 1
|
||||
ds 2
|
||||
CryLength:: ; c2b2
|
||||
ds 2
|
||||
LastVolume:: ; c2b4
|
||||
|
Loading…
Reference in New Issue
Block a user