Apple-2-Tools/4cade
1
0
Fork 0
mirror of https://github.com/a2-4am/4cade.git synced 2025-01-16 11:30:45 +00:00
Code Issues Projects Releases Wiki Activity

Treat SHR registers as write-only (#318)

Browse Source 
* Treat SHR registers as write-only

* Revert "no VidHD"

This reverts commit dffb3b1cda9aeb3b67a228960802d16533786a56.
This commit is contained in:
Tom Greene 2020-07-29 22:27:46 -04:00 committed by GitHub
parent 2c3aa275a1
commit 33e8319078
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/4cade.init.a
View File

@ -35,18 +35,6 @@
sta zpMachineStatus sta zpMachineStatus
sta SETC3ROM sta SETC3ROM
jsr HasVidHDCard ; check for VidHD card (allows super hi-res artwork even on non-IIgs machines) jsr HasVidHDCard ; check for VidHD card (allows super hi-res artwork even on non-IIgs machines)
bcc +
ldy #@VidHDlen
- lda @s_VidHD,y
sta $68A,y
dey
bpl -
@hang2 bmi @hang2
@s_VidHD !scrxor $80,"CANNOT RUN WITH VIDHD"
@VidHDlen=(*-@s_VidHD)-1
+
sta CLRC3ROM sta CLRC3ROM
ror zpMachineStatus ror zpMachineStatus
lda ROM_MACHINEID lda ROM_MACHINEID

9
src/ui.attract.shr.a
View File

@ -123,14 +123,12 @@ SHRArtworkCallback
BlankSHR BlankSHR
jsr Home jsr Home
lda NEWVIDEO ; set GS NEWVIDEO mode to turn on linearize lda #%01000001 ; set GS NEWVIDEO mode to turn on linearize
ora #%01000000 ; can't use TSB here - might not be 65816
sta NEWVIDEO sta NEWVIDEO
sta WRITEAUXMEM ; writes go to auxmem sta WRITEAUXMEM ; writes go to auxmem
lda SHADOW ; enable auxmem-to-bank-E1 shadowing on IIgs lda #$00 ; enable auxmem-to-bank-E1 shadowing on IIgs
and #$F7 ; can't use TRB here - might not be 65816
sta SHADOW sta SHADOW
lda #$20 ; clear $2000..$9FFF in auxmem lda #$20 ; clear $2000..$9FFF in auxmem
@ -139,8 +137,7 @@ BlankSHR
sta WRITEMAINMEM ; writes go to main memory sta WRITEMAINMEM ; writes go to main memory
lda NEWVIDEO ; set GS NEWVIDEO mode to turn on SHR mode lda #%11000001 ; set GS NEWVIDEO mode to turn on SHR mode
ora #%10000001 ; can't use TSB here - might not be 65816
sta NEWVIDEO sta NEWVIDEO
rts rts

6
src/ui.common.a
View File

@ -22,11 +22,11 @@ Home
lda MachineStatus lda MachineStatus
and #SUPPORTS_SHR and #SUPPORTS_SHR
beq @noSHR beq @noSHR
lda NEWVIDEO lda #%00000001 ; bit 7 = 0 -> IIgs Apple II-compatible video modes
and #%00011111 ; bit 7 = 0 -> IIgs Apple II-compatible video modes
; bit 6 = 0 -> IIgs 128K memory map is the same as the Apple IIe ; bit 6 = 0 -> IIgs 128K memory map is the same as the Apple IIe
; bit 5 = 0 -> IIgs DHGR is color, not monochrome ; bit 5 = 0 -> IIgs DHGR is color, not monochrome
; bits 0-4 unchanged ; bits 1-4 reserved
; bit 0 = 1 -> disable bank latch
sta NEWVIDEO sta NEWVIDEO
lda #$F0 lda #$F0
sta TBCOLOR ; white text on black background sta TBCOLOR ; white text on black background