Use ldxy/inxy/stxy macro in a few more places to shave bytes

Saves a whopping 8 bytes in DeskTop's Aux bank, but it's the thought that counts, right? No functional changes.
a2stuff · Oct 2, 2023 · 5619977 · 5619977
1 parent 585328e
commit 5619977
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/desktop/main.s b/desktop/main.s
@@ -14162,7 +14162,9 @@ measure:
         ldy     #0
         lda     (ptr),y
         sta     len
-        add16   ptr, #1, txt
+        ldxy    ptr
+        inxy
+        stxy    txt
         MGTK_CALL MGTK::TextWidth, txt
         cmp16   result, #kProgressDialogPathWidth
         rts
@@ -14736,7 +14738,9 @@ done:   rts
 
         ;; Compute text width
         pha                     ; A = flags
-        add16_8 ptr, #1, textptr
+        ldxy    ptr
+        inxy
+        stxy    textptr
         ldax    ptr
         jsr     AuxLoad
         sta     textlen

diff --git a/lib/alert_dialog.s b/lib/alert_dialog.s
@@ -694,7 +694,9 @@ END_PARAM_BLOCK
         ldy     #0
         lda     (a_shortcut),y
         sta     tw_params::textlen
-        add16_8 a_shortcut, #1, tw_params::textptr
+        ldxy    a_shortcut
+        inxy
+        stxy    tw_params::textptr
         MGTK_CALL MGTK::TextWidth, tw_params
 
         sub16_8 rect+MGTK::Rect::x2, #kButtonTextHOffset-2, pos+MGTK::Point::xcoord
@@ -706,7 +708,9 @@ END_PARAM_BLOCK
         ldy     #0
         lda     (a_label),y
         sta     tw_params::textlen
-        add16_8 a_label, #1, tw_params::textptr
+        ldxy    a_label
+        inxy
+        stxy    tw_params::textptr
         MGTK_CALL MGTK::TextWidth, tw_params
 
         add16   rect+MGTK::Rect::x1, rect+MGTK::Rect::x2, pos+MGTK::Point::xcoord

diff --git a/toolkits/btk.s b/toolkits/btk.s
@@ -262,7 +262,9 @@ END_PARAM_BLOCK
         lda     (a_label),y
         beq     :+
         sta     dt_params::textlen
-        add16_8 a_label, #1, dt_params::textptr
+        ldxy    a_label
+        inxy
+        stxy    dt_params::textptr
         MGTK_CALL MGTK::DrawText, dt_params
 :       rts
 .endproc ; _DrawLabel
@@ -284,7 +286,9 @@ END_PARAM_BLOCK
         rts
 :
         sta     tw_params::textlen
-        add16_8 a_label, #1, tw_params::textptr
+        ldxy    a_label
+        inxy
+        stxy    tw_params::textptr
         MGTK_CALL MGTK::TextWidth, tw_params
         ldax    tw_params::width
         rts
@@ -301,7 +305,9 @@ END_PARAM_BLOCK
         lda     (a_shortcut),y
         beq     :+
         sta     dt_params::textlen
-        add16_8 a_shortcut, #1, dt_params::textptr
+        ldxy    a_shortcut
+        inxy
+        stxy    dt_params::textptr
         MGTK_CALL MGTK::DrawText, dt_params
 :       rts
 .endproc ; _DrawShortcut
@@ -323,7 +329,9 @@ END_PARAM_BLOCK
         rts
 :
         sta     tw_params::textlen
-        add16_8 a_shortcut, #1, tw_params::textptr
+        ldxy    a_shortcut
+        inxy
+        stxy    tw_params::textptr
         MGTK_CALL MGTK::TextWidth, tw_params
         ldax    tw_params::width
         rts

diff --git a/toolkits/letk.s b/toolkits/letk.s
@@ -335,7 +335,9 @@ data    .addr
 length  .byte
 END_PARAM_BLOCK
 
-        add16_8 a_buf, #1, text_params::data
+        ldxy    a_buf
+        inxy
+        stxy    text_params::data
         ldy     #0
         lda     (a_buf),y
         sta     text_params::length
@@ -700,7 +702,9 @@ END_PARAM_BLOCK
         lda     (a_buf),y
         beq     :+
         sta     dt_params::textlen
-        add16_8 a_buf, #1, dt_params::textptr
+        ldxy    a_buf
+        inxy
+        stxy    dt_params::textptr
         MGTK_CALL MGTK::DrawText, dt_params
 :