diff options
| author | Javier Degirolmo | 2011-12-09 08:29:41 -0300 |
|---|---|---|
| committer | Javier Degirolmo | 2011-12-09 08:29:41 -0300 |
| commit | f7ef91fd060eaa724bdb6940fd1b21dd08923837 (patch) | |
| tree | 6eb32206d72aa7928a1c75bbdb1e0a322b5ce1a7 /src-z80/core | |
| parent | 6446fde6c853329dd62621e5e82e868d7f132f00 (diff) | |
Fixed FM volume restoring bug (I hope?)
Diffstat (limited to 'src-z80/core')
| -rw-r--r-- | src-z80/core/bgm.z80 | 22 | ||||
| -rw-r--r-- | src-z80/core/main.z80 | 2 | ||||
| -rw-r--r-- | src-z80/core/sfx.z80 | 2 | ||||
| -rw-r--r-- | src-z80/core/vars.z80 | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src-z80/core/bgm.z80 b/src-z80/core/bgm.z80 index ebda240..27cb89c 100644 --- a/src-z80/core/bgm.z80 +++ b/src-z80/core/bgm.z80 @@ -42,15 +42,15 @@ PlayBGM: ld hl, ProcessBGM ; Tell Echo to process BGM ld (DoTick_BGM+1), hl - ld b, 8 ; Kill all FM channels explicitly -.resetallfm: - ld a, b - and $04 - rrca - ld iyl, a - ld a, b - call KillFM - djnz .resetallfm +; ld b, 8 ; Kill all FM channels explicitly +;.resetallfm: +; ld a, b +; and $04 +; rrca +; ld iyl, a +; ld a, b +; call KillFM +; djnz .resetallfm jp IdleLoop ; End of subroutine @@ -83,6 +83,7 @@ ProcessBGM: ex de, hl ProcessBGMRun: +ProcessBGMSkip: PollPCM ; Fetch next event call GetParam PollPCM @@ -172,9 +173,6 @@ ProcessBGMSkip1: ; This is where we land after a locked event inc c .nobankskip1: -ProcessBGMSkip: ; This is where we land after a locked event - PollPCM ; without parameters - jp ProcessBGMRun ; Keep processing ;**************************************************************************** diff --git a/src-z80/core/main.z80 b/src-z80/core/main.z80 index bc63da9..5d9b7f6 100644 --- a/src-z80/core/main.z80 +++ b/src-z80/core/main.z80 @@ -309,7 +309,7 @@ GetParam: .noswitchp: ld b, (hl) ; Get volume - PollPCM + ;PollPCM inc l ; Get next address jp nz, .nonewbankp diff --git a/src-z80/core/sfx.z80 b/src-z80/core/sfx.z80 index 6a553bb..d008f0b 100644 --- a/src-z80/core/sfx.z80 +++ b/src-z80/core/sfx.z80 @@ -291,12 +291,14 @@ ClearSFX: PollPCM + push bc ld a, b ; Restore BGM FM volume add RAM_BGMFMVol&$FF ld l, a ld a, b ld b, (hl) call SetFMVolLoad + pop bc PollPCM inc b diff --git a/src-z80/core/vars.z80 b/src-z80/core/vars.z80 index ef9a676..8b6593a 100644 --- a/src-z80/core/vars.z80 +++ b/src-z80/core/vars.z80 @@ -15,7 +15,7 @@ RAM_PSGData: ds 4*16 ; PSG envelope data RAM_BGMFMInstr: ds 8 ; FM instruments used by BGM RAM_BGMFMVol: ds 8 ; FM volumes used by BGM -RAM_FMVolume: ds 8 ; Volume of each FM channel +;RAM_FMVolume: ds 8 ; Volume of each FM channel RAM_FMData: ds 8*5 ; FM info (for volume handling) ; ds 8*1 ... Register $B0 ; ds 8*1 ... Register $40 |