Merge pull request #658 from polluks/patch-9

Indicate a dummy outtext & some clean-up

diff --git a/libsrc/apple2/tgi/a2.lo.s b/libsrc/apple2/tgi/a2.lo.s
index 7238463a9a24211d7b9c03a1c1d39757f923b31b..2f5485e028d419fbeb5508dfafb8bb695ec4e6f9 100644 (file)
--- a/libsrc/apple2/tgi/a2.lo.s
+++ b/libsrc/apple2/tgi/a2.lo.s
@@ -58,8 +58,8 @@ Y2      :=      ptr4
         .word   48              ; Y resolution
         .byte   16              ; Number of drawing colors
         .byte   1               ; Number of screens available
-        .byte   8               ; System font X size
-        .byte   8               ; System font Y size
+        .byte   0               ; System font X size
+        .byte   0               ; System font Y size
         .word   $0198           ; Aspect ratio (based on 4/3 display)
         .byte   0               ; TGI driver flags
 

diff --git a/libsrc/nes/tgi/nes-64-56-2.s b/libsrc/nes/tgi/nes-64-56-2.s
index e4dcb56ceab311832f10e8a6455d9286fd2b439f..e6b7c5437ac8039af3726b322058ac17e6ed658d 100644 (file)
--- a/libsrc/nes/tgi/nes-64-56-2.s
+++ b/libsrc/nes/tgi/nes-64-56-2.s
@@ -79,12 +79,6 @@ TEMP2           = tmp4
 TEMP3           = sreg
 TEMP4           = sreg+1
 
-; Line routine stuff (must be on zpage)
-PB              = ptr3          ; (2)   LINE
-UB              = ptr4          ; (2)   LINE
-ERR             = regsave       ; (2)   LINE
-NX              = regsave+2     ; (2)   LINE
-
 ; Absolute variables used in the code
 
 .bss
@@ -95,17 +89,6 @@ ERROR:          .res    1       ; Error code
 COLOR:          .res    1       ; Current color
 PALETTE:        .res    2       ; The current palette
 
-; Line routine stuff
-
-OGora:
-COUNT:          .res    2
-OUkos:
-NY:             .res    2
-Y3:
-DX:             .res    1
-DY:             .res    1
-AY:             .res    1
-
 ; Constants and tables
 
 .rodata
@@ -242,6 +225,7 @@ SETCOLOR:
 ;
 
 SETVIEWPAGE:
+;       rts
 
 ; ------------------------------------------------------------------------
 ; SETDRAWPAGE: Set the drawable page. Called with the new page in A (0..n).