From 91e3811751a11de84723cf37c559516210f52f48 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Mon, 13 Oct 2008 03:25:57 +0000
Subject: [PATCH] cleanup

---
 chrget.s      | 1 +
 defines_kbd.s | 2 --
 defines_osi.s | 2 --
 misc1.s       | 6 +++---
 zeropage.s    | 8 ++------
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/chrget.s b/chrget.s
index e6f7e41..51d99ce 100644
--- a/chrget.s
+++ b/chrget.s
@@ -12,6 +12,7 @@ GENERIC_TXTPTR = GENERIC_CHRGOT + 1
 .endif
         cmp     #$3A
         bcs     L4058
+GENERIC_CHRGOT2:
         cmp     #$20
         beq     GENERIC_CHRGET
         sec
diff --git a/defines_kbd.s b/defines_kbd.s
index b2640ea..85dffe3 100644
--- a/defines_kbd.s
+++ b/defines_kbd.s
@@ -39,8 +39,6 @@ Z14             := $000F;64                        ; Ctrl+O flag
 JMPADRS         := $0093;A1
 LOWTRX          := $0094;AA                        ; $AB also EXPSGN?
 
-RNDSEED			:= $00D4
-
 L0207           := $0207
 L020A           := $020A
 ;L2A13           := $2A0A
diff --git a/defines_osi.s b/defines_osi.s
index e71b2ff..6e0284f 100644
--- a/defines_osi.s
+++ b/defines_osi.s
@@ -36,8 +36,6 @@ INPUTFLG        := $0062
 CPRMASK         := $0063
 Z14             := $0064                        ; Ctrl+O flag
 
-RNDSEED			:= $00D4
-
 L0207           := $0207
 L020A           := $020A
 MONRDKEY        := $FFEB
diff --git a/misc1.s b/misc1.s
index da39c7d..175697b 100644
--- a/misc1.s
+++ b/misc1.s
@@ -94,12 +94,12 @@ L2923:
 LETSTRING:
 .ifndef CONFIG_SMALL
         pla
+.endif
 
 ; ----------------------------------------------------------------------------
 ; INSTALL STRING, DESCRIPTOR ADDRESS IS AT FAC+3,4
 ; ----------------------------------------------------------------------------
 PUTSTR:
-.endif
 .ifdef CONFIG_CBM_ALL
         ldy     FORPNT+1
 .ifdef CBM1
@@ -110,7 +110,7 @@ PUTSTR:
         bne     LC92B
         jsr     FREFAC
         cmp     #$06
-.ifdef CBM2_KBD
+.ifdef CBM2
         bne     IQERR1
 .else
         beq     LC8E2
@@ -155,7 +155,7 @@ LC912:
         rts
 LC91C:
         lda     (INDEX),y
-        jsr     L00CF
+        jsr     CHRGOT2
         bcc     LC926
 IQERR1:
         jmp     IQERR
diff --git a/zeropage.s b/zeropage.s
index 7dd5db2..07c3295 100644
--- a/zeropage.s
+++ b/zeropage.s
@@ -110,13 +110,9 @@ FACEXTENSION = STRNG1+1
 STRNG2:
 	.res 2
 CHRGET:
-	.res 7
-	.res 6
-CHRGOT = GENERIC_CHRGOT-GENERIC_CHRGET + CHRGET
 TXTPTR = <(GENERIC_TXTPTR-GENERIC_CHRGET + CHRGET)
-.ifndef CONFIG_SMALL
-L00CF:
+CHRGOT = <(GENERIC_CHRGOT-GENERIC_CHRGET + CHRGET)
+CHRGOT2 = <(GENERIC_CHRGOT2-GENERIC_CHRGET + CHRGET)
 RNDSEED = <(GENERIC_RNDSEED-GENERIC_CHRGET + CHRGET)
-.endif