From 57be95bb4aa3d309f272899032392f688fd885aa Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 07:34:16 +0000
Subject: [PATCH] cleanup

---
 array.s |  2 +-
 flow.s  |  2 +-
 init.s  | 26 +++++++++++++-------------
 trig.s  |  3 ++-
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/array.s b/array.s
index 39dfa55..7d187ab 100644
--- a/array.s
+++ b/array.s
@@ -346,7 +346,7 @@ L3124:
         bpl     L3135
         dex
 L3135:
-  .ifdef .def(CONFIG_SMALL) && (.def(CONFIG_2))
+  .if .def(CONFIG_SMALL) && (.def(CONFIG_2))
         stx     RESULT+1
   .else
         lda     VARNAM+1
diff --git a/flow.s b/flow.s
index de3454d..f91288c 100644
--- a/flow.s
+++ b/flow.s
@@ -142,7 +142,7 @@ NEWSTT2:
 EXECUTE_STATEMENT:
 .ifndef CONFIG_11A
         beq     RET1
-.ifndef APPLE
+.ifndef APPLE; ???
         sec
 .endif
 .else
diff --git a/init.s b/init.s
index 3470c7a..2295540 100644
--- a/init.s
+++ b/init.s
@@ -287,8 +287,8 @@ L4129:
         clc
         adc     Z17
         sta     Z18
-L4136:
 .endif
+L4136:
 .ifdef KIM /* RAM? */
         lda     #<QT_WANT
         ldy     #>QT_WANT
@@ -308,22 +308,22 @@ L4136:
 L4157:
         ldx     #<IQERR
         ldy     #>IQERR
-        stx     UNFNC+26
-        sty     UNFNC+26+1
-        ldx     #<ATN
-        ldy     #>ATN
+        stx     UNFNC+(13*2)
+        sty     UNFNC+(13*2)+1
+        ldx     #<ATN	; overwrite starting
+        ldy     #>ATN	; with ATN
         cmp     #'A'
         beq     L4183
         ldx     #<IQERR
         ldy     #>IQERR
-        stx     UNFNC+20
-        sty     UNFNC+20+1
-        stx     UNFNC+20+1+3
-        sty     UNFNC+20+1+3+1
-        stx     UNFNC+20+1+1
-        sty     UNFNC+20+1+1+1
-        ldx     #<SIN_COS_TAN_ATN
-        ldy     #>SIN_COS_TAN_ATN
+        stx     UNFNC+(10*2)
+        sty     UNFNC+(10*2)+1
+        stx     UNFNC+(12*2)
+        sty     UNFNC+(12*2)+1
+        stx     UNFNC+(11*2)
+        sty     UNFNC+(11*2)+1
+        ldx     #<SIN_COS_TAN_ATN	; overwrite
+        ldy     #>SIN_COS_TAN_ATN	; all of trig.s
 L4183:
 .else
         ldx     #<RAMSTART2
diff --git a/trig.s b/trig.s
index 65d2956..f977949 100644
--- a/trig.s
+++ b/trig.s
@@ -194,7 +194,8 @@ POLY_ATN:
 		.byte	$7E,$4C,$CC,$91,$C7
 		.byte	$7F,$AA,$AA,$AA,$13
         .byte   $81,$00,$00,$00,$00
+.endif
+
 .ifdef KIM
 		.byte	$00 ; XXX
 .endif
-.endif