diff options
Diffstat (limited to 'src-z80/core')
| -rw-r--r-- | src-z80/core/main.z80 | 2 | ||||
| -rw-r--r-- | src-z80/core/sfx.z80 | 32 | ||||
| -rw-r--r-- | src-z80/core/vars.z80 | 3 |
3 files changed, 22 insertions, 15 deletions
diff --git a/src-z80/core/main.z80 b/src-z80/core/main.z80 index cb0329e..c5aef0f 100644 --- a/src-z80/core/main.z80 +++ b/src-z80/core/main.z80 @@ -87,7 +87,7 @@ EntryPoint: ld (ix+0), $25 ld (ix+1), $03 ld (ix+0), $26 - ld (ix+1), $C9 + ld (ix+1), $C8 ;ld (ix+1), $FF ld (ix+0), $27 ld (ix+1), $3F diff --git a/src-z80/core/sfx.z80 b/src-z80/core/sfx.z80 index b7e26aa..c778776 100644 --- a/src-z80/core/sfx.z80 +++ b/src-z80/core/sfx.z80 @@ -276,23 +276,29 @@ ClearSFX: ld a, b ; Kill ADSR call KillFM - PollPCM + ;PollPCM + + ;ld hl, RAM_BGMFMVol ; Restore BGM FM volume + ;ld a, b + ;add l + ;ld l, a + ;ld c, (hl) + ;ld a, l + ;add 8 + ;ld l, a + ;ld (hl), c - ld hl, RAM_BGMFMVol ; Restore BGM FM volume + PollPCM + + ;ld a, l ; Restore BGM FM instrument + ;sub 8*2 + ;ld l, a + + ld hl, RAM_BGMFMInstr ld a, b add l ld l, a - ld c, (hl) - ld a, l - add 8 - ld l, a - ld (hl), c - - PollPCM - - ld a, l ; Restore BGM FM instrument - sub 8*2 - ld l, a + push bc push de push hl diff --git a/src-z80/core/vars.z80 b/src-z80/core/vars.z80 index ef9a676..3496845 100644 --- a/src-z80/core/vars.z80 +++ b/src-z80/core/vars.z80 @@ -15,7 +15,8 @@ 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 |