Danger in the sound engine.

This commit is contained in:
yenatch 2014-04-22 00:02:40 -04:00
parent 1dc2a1776c
commit 7ab25c9f59
1 changed files with 8 additions and 9 deletions

View File

@ -201,8 +201,8 @@ _UpdateSound:: ; e805c
ld [CurChannel], a ld [CurChannel], a
cp a, $08 ; are we done? cp a, $08 ; are we done?
jp nz, .loop ; do it all again jp nz, .loop ; do it all again
; writing to hardware registers?
call Functione8307 call PlayDanger
; fade music in/out ; fade music in/out
call FadeMusic call FadeMusic
; write volume to hardware register ; write volume to hardware register
@ -240,7 +240,7 @@ UpdateChannels: ; e8125
dw .Channel8 dw .Channel8
.Channel1 .Channel1
ld a, [$c2a6] ld a, [Danger]
bit 7, a bit 7, a
ret nz ret nz
.Channel5 .Channel5
@ -513,9 +513,8 @@ _CheckSFX: ; e82e7
ret ret
; e8307 ; e8307
Functione8307: ; e8307 PlayDanger: ; e8307
; what is $c2a6? ld a, [Danger]
ld a, [$c2a6]
bit 7, a bit 7, a
ret z ret z
and a, $7f and a, $7f
@ -524,7 +523,7 @@ Functione8307: ; e8307
jr c, .asm_e8335 jr c, .asm_e8335
and a and a
jr z, .asm_e8323 jr z, .asm_e8323
cp a, $10 cp a, 16 ; halfway
jr z, .asm_e831e jr z, .asm_e831e
jr .asm_e8335 jr .asm_e8335
.asm_e831e .asm_e831e
@ -546,12 +545,12 @@ Functione8307: ; e8307
.asm_e8335 .asm_e8335
ld a, d ld a, d
inc a inc a
cp a, $1e cp a, 30
jr c, .asm_e833c jr c, .asm_e833c
xor a xor a
.asm_e833c .asm_e833c
or a, $80 or a, $80
ld [$c2a6], a ld [Danger], a
; is hw ch1 on? ; is hw ch1 on?
ld a, [SoundOutput] ld a, [SoundOutput]
and a, $11 and a, $11