fix IIe colouring issues

This commit is contained in:
Peter Ferrie 2019-12-09 17:38:52 -08:00
parent cf93d79009
commit c02b09693a
2 changed files with 5 additions and 17 deletions

View File

@ -18,7 +18,7 @@
; D670..DB5F - HGR font code & ProRWTS glue code ; D670..DB5F - HGR font code & ProRWTS glue code
; DB60..DB6E - backup of stack (during gameplay and self-running demos) ; DB60..DB6E - backup of stack (during gameplay and self-running demos)
; ...unused... ; ...unused...
; DBB2..DBFF - (de)acceleration function ; DBAF..DBFF - (de)acceleration function
; DC00..DFFF - HGR font data ; DC00..DFFF - HGR font data
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
@ -112,7 +112,7 @@ gCheatsAvailable = $D000 ; master cheats table, indexed by game index in gGam
MachineStatus = $FFF9 MachineStatus = $FFF9
; LC RAM 2 ; LC RAM 2
DisableAccelerator = $DBB2 DisableAccelerator = $DBAF
EnableAccelerator = DisableAccelerator+3 EnableAccelerator = DisableAccelerator+3
; AND masks for MachineStatus ; AND masks for MachineStatus

View File

@ -197,7 +197,7 @@ maccheck
iic iic
ldx romid_c ldx romid_c
cpx #ROMID_CPLUS cpx #ROMID_CPLUS
bne patch_zc ; not a //c+, eventually hit Zip bne build_addon ; not a //c+, eventually hit Zip
lda #<iicplus lda #<iicplus
ldy #>iicplus ldy #>iicplus
@ -212,14 +212,6 @@ build_setspeed
ldx #(end_setspeed-setspeed) ldx #(end_setspeed-setspeed)
rts rts
patch_zc
lda #$D0
sta zc_iic1 + 2
sta zc_iic2
lda #(FASTChip - zc_iic2) - 2
sta zc_iic2 + 1
; fall through
build_addon build_addon
lda #<addon lda #<addon
ldy #>addon ldy #>addon
@ -346,7 +338,6 @@ addon
tay tay
zc_iic1
sta uw_fast,y ; value does not matter, SMC sta uw_fast,y ; value does not matter, SMC
; no blind setting on the IIc ; no blind setting on the IIc
; it has unwanted side-effects ; it has unwanted side-effects
@ -361,10 +352,7 @@ zc_iic1
+ lda #ZC_UNLOCK + lda #ZC_UNLOCK
php php
sei ; timing sensitive sei ; timing sensitive
zc_iic2 sta zc_lock
sta zc_lock ; SMC
; no blind Zip Chip on the IIc
; it has unwanted side-effects
sta zc_lock sta zc_lock
sta zc_lock sta zc_lock
sta zc_lock sta zc_lock
@ -372,6 +360,7 @@ zc_iic2
sta zc_lock,x ; disable/enable sta zc_lock,x ; disable/enable
lda #ZC_LOCK lda #ZC_LOCK
sta zc_lock sta zc_lock
sta $C05B ; fix colouring
FASTChip FASTChip
lda #FC_UNLOCK lda #FC_UNLOCK
@ -386,7 +375,6 @@ FASTChip
lda #FC_LOCK lda #FC_LOCK
sta fc_lock sta fc_lock
skip_chip
plp ; restore interrupt state plp ; restore interrupt state
rts rts
end_addon end_addon