Reinstated font loading code that got dropped.

2024-12-29 05:29:28 +00:00 · 2021-09-23 12:59:36 -04:00 · 2021-09-23 12:59:36 -04:00 · 2d67fff3fb
commit 2d67fff3fb
parent fa879f7f52
20 changed files with 51 additions and 0 deletions
--- a/applecorn.po
+++ b/applecorn.po
--- a/applecorn.s
+++ b/applecorn.s
@ -58,6 +58,9 @@ COPYBUF     EQU   $9200       ; File copy needs separate buffer
 * Location of FDraw library in main memory
 FDRAWADDR   EQU   $9400

+* Location of FDraw library in main memory
+FONTADDR    EQU   $A900
+
 * Address in aux memory where ROM will be loaded
 AUXADDR     EQU   $8000

@ -210,6 +213,8 @@ MAINZP      MAC



+
+



--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@ -478,3 +478,5 @@ OSBM2        ASC   ').'



+
+
--- a/auxmem.chario.s
+++ b/auxmem.chario.s
@ -453,3 +453,5 @@ BYTE76       LDX   #$00                      ; Update LEDs and return X=SHIFT



+
+
--- a/auxmem.gfx.s
+++ b/auxmem.gfx.s
@ -96,3 +96,5 @@ RELCOORD    CLC



+
+
--- a/auxmem.hostfs.s
+++ b/auxmem.hostfs.s
@ -983,3 +983,5 @@ ERROR2E     DW    $C800



+
+
--- a/auxmem.init.s
+++ b/auxmem.init.s
@ -180,3 +180,5 @@ BYTE00A     BRK
 HELLO       ASC   'Applecorn MOS 2021-09-22'
            DB    $00                        ; Unify MOS messages

+
+
--- a/auxmem.misc.s
+++ b/auxmem.misc.s
@ -536,3 +536,5 @@ AUXBLK      ASC   '**ENDOFCODE**'



+
+
--- a/auxmem.mosequ.s
+++ b/auxmem.mosequ.s
@ -75,3 +75,5 @@ OSFILECB     EQU   $2EE        ; OSFILE control block



+
+
--- a/auxmem.oscli.s
+++ b/auxmem.oscli.s
@ -503,3 +503,5 @@ ECHOLP1     JSR   GSREAD



+
+
--- a/auxmem.vdu.s
+++ b/auxmem.vdu.s
@ -763,3 +763,5 @@ BYTEA02      LDY   VDUVARS+1,X
             TAX
             RTS

+
+
--- a/mainmem.fsequ.s
+++ b/mainmem.fsequ.s
@ -65,6 +65,8 @@ GEOFCMD     EQU   $D1



+
+



--- a/mainmem.init.s
+++ b/mainmem.init.s
@ -111,6 +111,8 @@ RESET       TSX



+
+



--- a/mainmem.ldr.s
+++ b/mainmem.ldr.s
@ -30,6 +30,15 @@ START       JSR   CROUT
            CLC                    ; Load into main
            JSR   LOADCODE

+            LDA   #<:FNTFILE
+            STA   OPENPL+1
+            LDA   #>:FNTFILE
+            STA   OPENPL+2
+            LDA   #>FONTADDR       ; Address in main
+            LDX   #<FONTADDR
+            CLC                    ; Load into main
+            JSR   LOADCODE
+
            LDA   #<MOSSHIM        ; Start address of MOS shim
            STA   A1L
            LDA   #>MOSSHIM
@ -69,6 +78,7 @@ START       JSR   CROUT
            >>>   XF2AUX,AUXMOS1

 :FDFILE     STR   "FDRAW.FAST"     ; Filename for FDraw lib
+:FNTFILE    STR   "FONT.DAT"       ; Filename for bitmap font

 * Load image from file into memory
 * On entry: OPENPL set up to point to file to load
@ -148,3 +158,5 @@ LOADCODE    PHP                    ; Save carry flag
 :CANTOPEN   ASC   "Unable to open "
            DB    $00

+
+
--- a/mainmem.lists.s
+++ b/mainmem.lists.s
@ -129,6 +129,8 @@ QUITPL      HEX   04          ; Number of parameters



+
+



--- a/mainmem.menu.s
+++ b/mainmem.menu.s
@ -146,6 +146,8 @@ ROM8        STR   "USERROM2.ROM"



+
+



--- a/mainmem.misc.s
+++ b/mainmem.misc.s
@ -215,6 +215,8 @@ FILEREFS    DB    $00,$00,$00,$00



+
+



--- a/mainmem.path.s
+++ b/mainmem.path.s
@ -310,6 +310,8 @@ PREFIX      DS    65           ; Buffer for ProDOS prefix



+
+



--- a/mainmem.svc.s
+++ b/mainmem.svc.s
@ -1140,3 +1140,5 @@ PLOTMODE     DB    $00                ; K value for PLOT K,X,Y



+
+
--- a/mainmem.wild.s
+++ b/mainmem.wild.s
@ -389,4 +389,6 @@ MATCHBUF    DS    65            ; For storing match results (Pascal str)



+
+
				`@ -453,3 +453,5 @@ BYTE76 LDX #$00 ; Update LEDs and return X=SHIFT`
				`@ -310,6 +310,8 @@ PREFIX DS 65 ; Buffer for ProDOS prefix`
				`@ -1140,3 +1140,5 @@ PLOTMODE DB $00 ; K value for PLOT K,X,Y`
				`@ -389,4 +389,6 @@ MATCHBUF DS 65 ; For storing match results (Pascal str)`