From df3ad2054ce8e9aea783ddadbbe91c5c86247c7f Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Fri, 15 Sep 2017 19:08:20 -0700
Subject: [PATCH] Image: Use hat operator to get 3rd byte; more symbols for STF

---
 desk.acc/show_image_file.s |  6 +++---
 desk.acc/show_text_file.s  | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/desk.acc/show_image_file.s b/desk.acc/show_image_file.s
index 57b1079..8850343 100644
--- a/desk.acc/show_image_file.s
+++ b/desk.acc/show_image_file.s
@@ -394,11 +394,11 @@ end:    rts
         ;; If bigger than $2000, assume DHR
 
         lda     get_eof_params::length ; fancy 3-byte unsigned compare
-        cmp     #<hires_size+1
+        cmp     #<(hires_size+1)
         lda     get_eof_params::length+1
-        sbc     #>hires_size+1
+        sbc     #>(hires_size+1)
         lda     get_eof_params::length+2
-        sbc     #0
+        sbc     #^(hires_size+1)
         bcs     dhr
 
         jsr     show_shr_file
diff --git a/desk.acc/show_text_file.s b/desk.acc/show_text_file.s
index 569fdf7..66de55e 100644
--- a/desk.acc/show_text_file.s
+++ b/desk.acc/show_text_file.s
@@ -1031,9 +1031,9 @@ L0E7E:  A2D_CALL A2D_SET_POS, line_pos
         cmp     L0969
         beq     L0ED7
 :       inc     L096C
-        bne     L0ED4
+        bne     :+
         inc     L096D
-L0ED4:  jmp     L0E68
+:       jmp     L0E68
 
 L0ED7:  jsr     L1109
         rts
@@ -1321,24 +1321,27 @@ loop:   clc
 ;;; if fixed mode, do a main->aux copy of a code block ???
 .proc L1109
         lda     fixed_mode_flag ; if not fixed (i.e. proportional)
-        beq     end             ; then exit
+        beq     done            ; then exit
 
-        lda     #$00            ; start := $1100
+        start := $1100
+        end   := $117E
+        dest  := $8803
+
+        lda     #<start
         sta     STARTLO
-        lda     #$7E
-        sta     ENDLO           ; end := $117E
-        lda     #$11
+        lda     #<end
+        sta     ENDLO
+        lda     #>start
         sta     STARTHI
         sta     ENDHI
 
-        dest := $8803
         lda     #>dest
         sta     DESTINATIONHI
         lda     #<dest
         sta     DESTINATIONLO
         sec                     ; main>aux
         jsr     AUXMOVE
-end:    rts
+done:   rts
 .endproc
 
 .proc L1129                     ; ???