From e5568a1eee4fb28f9cdc375cdaba96659d2dffa0 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Wed, 27 Oct 2021 10:40:25 -0400
Subject: [PATCH] Merged PR 138 'Tweeked ROMSelect'

---
 applecorn.po  | Bin 819200 -> 819200 bytes
 auxmem.init.s |   3 ++-
 auxmem.misc.s |  33 ++++++++++++++++++++-------------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index b6ee8b85f2d9cf7c8472bedf6cfd60fd5f5765d0..0486e7c9d5d6bbc4fb9335fdd5b5052a5b6e9172 100644
GIT binary patch
delta 4078
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
NQ<vyQT+oe-`3LNQ*jfMp

delta 4089
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
bCa653BFFC6gZ=u*{d(no{ixIW(Xsyr|H<sI

diff --git a/auxmem.init.s b/auxmem.init.s
index fb62540..d053224 100644
--- a/auxmem.init.s
+++ b/auxmem.init.s
@@ -123,7 +123,7 @@ MOSHIGH     SEI
             DEX
             BPL   :INITPG2
 
-            JSR   INITROMS                   ; Initialize sideways ROM table
+            JSR   ROMINIT                    ; Initialize sideways ROM table
 
             JSR   KBDINIT                    ; Returns A=startup MODE
             JSR   VDUINIT                    ; Initialise VDU driver
@@ -194,6 +194,7 @@ BYTE00A     BRK
 HELLO       ASC   'Applecorn MOS 2021-10-27'
             DB    $00                        ; Unify MOS messages
 
+MAXROM      DB    $00              ; Index of highest sideways ROM
 
 
 
diff --git a/auxmem.misc.s b/auxmem.misc.s
index e5a7e58..38b9389 100644
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@@ -5,6 +5,8 @@
 * 02-Sep-2021 Written GSINIT/GSREAD
 * 11-Sep-2021 PR16DEC uses OS workspace, added rest of default vectors/etc.
 * 20-Sep-2021 Updated PRDECIMAL routine, prints up to 32 bits.
+* 25-Oct-2021 Initial pseudo-sideways ROM selection code.
+* 26-Oct-2021 Corrected entry parameters to OSRDRM.
 
 
 * OSBYTE $80 - ADVAL
@@ -314,10 +316,12 @@ GSREADOK    INY                    ; Step to next character
 
 
 * Read a byte from sideways ROM
-* On entry, X=ROM to read from
+* On entry, Y=ROM to read from
 * On exit,  A=byte read, X=current ROM, Y=$00
 RDROM       LDA   $F4
-            PHA
+            PHA                    ; Save current ROM
+            TYA
+            TAX                    ; X=ROM to read from
             JSR   ROMSELECT        ; Page in the required ROM
             LDY   #$00
             LDA   ($F6),Y          ; Read the byte
@@ -326,27 +330,33 @@ RDROM       LDA   $F4
 * Select a sideways ROM
 * X=ROM to select
 * All registers must be preserved
-ROMSELECT   CPX   $F4
+ROMSELECT   CPX   $F8
             BEQ   :ROMSELOK        ; Already selected
 
 * Insert code here for faking sideways ROMs by loading or otherwise
 * fetching code to $8000. All registers must be preserved.
-            PHA
+            CPX   MAXROM
+            BEQ   :ROMSEL
+            BCS   :ROMSELOK        ; Out of range, ignore
+:ROMSEL     PHA
             PHX
             PHY
             TXA
             ASL   A
             TAX
-            LDA   ROMTAB,X         ; LSB of pointer to name
+            LDA   ROMTAB+0,X       ; LSB of pointer to name
             STA   OSFILECB+0
             LDA   ROMTAB+1,X       ; MSB of pointer to name
             STA   OSFILECB+1
             STZ   OSFILECB+2       ; Dest address $8000
             LDA   #$80
             STA   OSFILECB+3
+            STZ   OSFILECB+4
+            STZ   OSFILECB+5
+            STZ   OSFILECB+6       ; Load to specified address
             LDX   #<OSFILECB
             LDY   #>OSFILECB
-            LDA   OSLPTR+0         ; Preserve OSLPTR
+            LDA   OSLPTR+0
             PHA
             LDA   OSLPTR+1
             PHA
@@ -359,8 +369,8 @@ ROMSELECT   CPX   $F4
             PLY
             PLX
             PLA
-            STX   $F4              ; Set Current ROM number
-:ROMSELOK
+            STX   $F8              ; Set ROM loaded
+:ROMSELOK   STX   $F4              ; Set Current ROM number
 EVENT       RTS
 
 BASICROM    ASC   'BASIC2.ROM'
@@ -387,10 +397,9 @@ PASCROM1    ASC   'PASC.1.10.1.ROM'
 PASCROM2    ASC   'PASC.1.10.2.ROM'
             DB    $0D,$00
 
-MAXROM      DB    $00              ; Index of highest sideways ROM
 
 * Initialize ROMTAB according to user selection in menu
-INITROMS    STZ   MAXROM           ; One sideways ROM only
+ROMINIT     STZ   MAXROM           ; One sideways ROM only
             STA   $C002            ; Read main mem
             LDA   USERSEL
             STA   $C003            ; Read aux mem
@@ -455,7 +464,7 @@ INITROMS    STZ   MAXROM           ; One sideways ROM only
             LDA   #7               ; 8 sideways ROMs
             STA   MAXROM
 :DONE       LDA   #$FF
-            STA   $F4              ; Force ROM to load
+            STA   $F8              ; Force ROM to load
             RTS
 
 * Active sideways ROMs
@@ -668,5 +677,3 @@ AUXBLK      ASC   '**ENDOFCODE**'
 
 
 
-
-