shave some cycles

2021-12-04 22:10:23 -05:00 · 2021-12-04 22:10:23 -05:00 · 37d50064c6
parent 7cc576c8a0
commit 37d50064c6
35 changed files with 57 additions and 53 deletions
--- a/src/fx/fx.shr.80boxes.common.a
+++ b/src/fx/fx.shr.80boxes.common.a
@ -126,12 +126,23 @@ BoxesY    = $BEB0                    ; [$50 bytes][accessed via BoxesY-1][should
         ;WRITEAUXMEM active
         jmp   MainLoop

+siderows !byte 1,5,9,13,17,21
+branches !byte across2-back
+         !byte across3-back
+         !byte across4-back
+         !byte across5-back
+         !byte across6-back
+         !byte across7-back
+
 start
 !pseudopc 0 {
 copy1    ldx   <topx+1
         +SET_ROW_X
         ldy   <lefty+1
-         jsr   across1
+         +COPY_BYTE_AND_INY
+         +COPY_BYTE_AND_INY
+         +COPY_BYTE_AND_INY
+         +COPY_BYTE
 ReBox    ldx   #$00                  ; [SMC] X = BoxLoop index 1..80
 NextBox  dex
         bne   BoxLoop
@ -142,6 +153,7 @@ NextBox  dex
         bpl   MainLoop
 exit     sta   WRITEMAINMEM
 setV     rts
+
 MainLoop ldx   #80
 BoxLoop  ldy   BoxStages-1, x        ; for each box, get its current stage
         inc   BoxStages-1, x        ; increment every box's stage every time through the loop
@ -160,20 +172,19 @@ stage    ldx   #$00                  ; [SMC] X = stage index 1..7, reinitialized
         sta   <lefty+1
         dex
         beq   copy1
-         lda   <siderows-1, x
+         lda   siderows-1, x
         sta   <rowcount
-         lda   <across_lo-1, x
-         sta   <j+1
+         lda   branches-1, x
+         sta   <branch+1
 topx     ldx   #$FD                  ; [SMC]
         clv
 copy2row clc
         !byte $A9
 copy1row sec
-         +SET_ROW_X
         ldy   <lefty+1
-j        jsr   across7               ; [SMC low byte]
-         inx
-         bcc   copy1row
+         +SET_ROW_X
+branch   bne   across7               ; [SMC branch target][always branches]
+back     bcc   copy1row
         bvs   ReBox
         sty   <righty+1
 copyside +SET_ROW_X
@ -199,26 +210,19 @@ across3  +COPY_BYTE_AND_INY
         +COPY_BYTE_AND_INY
 across2  +COPY_BYTE_AND_INY
         +COPY_BYTE_AND_INY
-across1  +COPY_BYTE_AND_INY
+         +COPY_BYTE_AND_INY
         +COPY_BYTE_AND_INY
         +COPY_BYTE_AND_INY
         lda   (src+1), y
 src      sta   $FDFD, y              ; [SMC]
-         rts
+         inx
+         bne   back                  ; always branches

 toprow   !byte 12,10,8,6,4,2,0
 leftbyte !byte 6,5,4,3,2,1,0
-siderows !byte 1,5,9,13,17,21
-across_lo
-         !byte <across2
-         !byte <across3
-         !byte <across4
-         !byte <across5
-         !byte <across6
-         !byte <across7
 rowcount
 }
-!if (*-start>=$FF) {
+!if (*-start>$FF) {
         !error "Code is too big to fit on zero page! ", *-start
 }

--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10806970
+         !be24  10807078
         !le16     4244
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10759850
+         !be24  10759958
         !le16     5223
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10703061
+         !be24  10703169
         !le16     3593
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10715438
+         !be24  10715546
         !le16     3953
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10730844
+         !be24  10730952
         !le16     4628
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10748126
+         !be24  10748234
         !le16     5575
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10811214
+         !be24  10811322
         !le16      410
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10811932
+         !be24  10812040
         !le16      448
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10812380
+         !be24  10812488
         !le16      303
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10767219
+         !be24  10767327
         !le16     1242
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10805640
+         !be24  10805748
         !le16     1249
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10791630
+         !be24  10791738
         !le16      464
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10765073
+         !be24  10765181
         !le16     2146
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10768692
+         !be24  10768800
         !le16     6149
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10811624
+         !be24  10811732
         !le16      107
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10806889
+         !be24  10806997
         !le16       81
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10811731
+         !be24  10811839
         !le16      201
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10792094
+         !be24  10792202
         !le16     4407
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10796501
+         !be24  10796609
         !le16     1533
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10798034
+         !be24  10798142
         !le16     1040
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10799074
+         !be24  10799182
         !le16     3237
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10802311
+         !be24  10802419
         !le16     2764
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10805075
+         !be24  10805183
         !le16      460
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10805535
+         !be24  10805643
         !le16      105
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10812683
+         !be24  10812791
         !le16     2370
--- a/src/index/miniattract.idx.a
+++ b/src/index/miniattract.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10779735
+         !be24  10779843
         !le16     6149
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10753701
+         !be24  10753809
         !le16     6149
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10695029
+         !be24  10695137
         !le16     8032
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10706654
+         !be24  10706762
         !le16     8784
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10719391
+         !be24  10719499
         !le16    11453
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10735472
+         !be24  10735580
         !le16    12654
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10768461
+         !be24  10768569
         !le16      231
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10774841
+         !be24  10774949
         !le16     4894
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  10785884
+         !be24  10785992
         !le16     5746