4 years ago · bd9f81d8c7
--- a/src/gfx/text.z80
+++ b/src/gfx/text.z80
@@ -381,7 +381,6 @@ VPutC_OS_large:
 
   sub 1
 
   jr c,+_
 
   ld b,a
 
-  ld a,$7F
 
   call OS_font_sub
 
   inc l
 
   inc h
@@ -394,7 +393,6 @@ VPutC_OS_small:
 
   or a
 
   jr z,+_
 
   ld b,a
 
-  ld a,3
 
   call OS_font_sub
 
   inc de
 
   jp VputSCStepIn
@@ -431,6 +429,7 @@ OS_font_sub:
 
   call os_char_ptr
 
   ld de,lfont_record
 
   ld bc,8
 
+  ld a,(font_ptr_page)
 
   call readarc
 
   ld hl,lFont_record
 
   ld a,8
--- a/src/grammer.z80
+++ b/src/grammer.z80
@@ -211,7 +211,16 @@ _:
 
   cp 2Bh
 
   call z,ParseNextFullArg
 
   ld (FontPointer),bc
 
+  ld b,a
 
   ld c,0
 
+  ld a,(textmode)
 
+  cp 4
 
+  jr c,+_
 
+  ld c,3      ;OS small font
 
+  jr z,+_
 
+  ld c,$7F    ;OS large font
 
+_:
 
+  ld a,b
 
   cp $2B
 
   call z,ParseNextFullArg
 
   ld a,c
@@ -1882,12 +1891,13 @@ setup_readarc:
 
 #ifndef include_TSA
 
   ld hl,ReadArcData
 
   ld de,TSA
 
-;mov 71 bytes
 
-  call mov14
 
-  call mov14
 
-  call mov14
 
-  call mov14
 
+;mov 76 bytes
 
+  call mov15
 
+  call mov15
 
+  call mov15
 
+  call mov15
 
   call mov15
 
+  ldi
 
   in a,(6)
 
   ld (page_restore),a
 
   ld (bincomparepagerestore),a