From 0d3c004ca4886871eafc178ef0b27483e59a3b42 Mon Sep 17 00:00:00 2001 From: Tom Greene Date: Sun, 29 Mar 2020 19:01:23 -0400 Subject: [PATCH] Fix for Fastchip (#145) * Fix for Fastchip * Move gGlobalPrefsStore back to D000 --- src/4cade.a | 5 +---- src/constants.a | 4 ++-- src/hw.accel.a | 5 ++--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/4cade.a b/src/4cade.a index 5e52054f3..5b92c814e 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -123,10 +123,7 @@ gSearchStore gSlideshowStore !word $0800 gGlobalPrefsStore - !word $D001 ; leave $D000 alone because FastChip accelerator - ; flips out if it has certain values (it will - ; be set to $55 as part of the 64K memory test, - ; which is apparently one of the acceptable values) + !word $D000 gGamesListStore !word $FDFD ; SMC SwitchToBank2 diff --git a/src/constants.a b/src/constants.a index 035cd9821..693cacfff 100644 --- a/src/constants.a +++ b/src/constants.a @@ -20,7 +20,7 @@ ; D670..DB98 - HGR font code & ProRWTS glue code ; DB99..DBA7 - backup of stack (during gameplay and self-running demos) ; ...unused... -; DBAF..DBFF - (de)acceleration function +; DBB4..DBFF - (de)acceleration function ; DC00..DFFF - HGR font data ;------------------------------------------------------------------------------ @@ -123,7 +123,7 @@ MockingboardStuff = $FFF8 ; bit 7 = 1 if speech chip present (Mockingboard "C" MachineStatus = $FFF9 ; LC RAM 2 -DisableAccelerator = $DBAF +DisableAccelerator = $DBB4 EnableAccelerator = DisableAccelerator+3 ; AND masks for MockingboardStuff diff --git a/src/hw.accel.a b/src/hw.accel.a index e83e7e913..f9f366d49 100755 --- a/src/hw.accel.a +++ b/src/hw.accel.a @@ -119,6 +119,7 @@ EX_3MHZMASK = $C0 ; 3.6Mhz ; FASTChip fc_lock = $C06A fc_enable = $C06B +fc_speed = $C06D fc_config = $C06E fc_data = $C06F FC_UNLOCK = $6A ; write 4 times @@ -389,9 +390,7 @@ FASTChip sta fc_lock sta fc_lock sta fc_enable - lda #0 - sta fc_config - sty fc_data + sty fc_speed lda #FC_LOCK sta fc_lock