From 93e0b82214a16d33f3f6700a3f42c5cb26c26983 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Sun, 12 Dec 2021 22:13:46 -0500
Subject: [PATCH] shave some bytes

---
 src/fx/fx.dgr.fizzle.a     | 37 +++++++++++++++++--------------------
 src/index/credits.idx.a    |  2 +-
 src/index/decrunch.idx.a   |  2 +-
 src/index/dgr.fizzle.idx.a |  2 +-
 src/index/helptext.idx.a   |  2 +-
 src/index/joystick.idx.a   |  2 +-
 src/ui.attract.dgr.a       | 11 +++++------
 7 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/src/fx/fx.dgr.fizzle.a b/src/fx/fx.dgr.fizzle.a
index 86d3fe3b5..cc655c73a 100644
--- a/src/fx/fx.dgr.fizzle.a
+++ b/src/fx/fx.dgr.fizzle.a
@@ -5,24 +5,22 @@
 !to "build/DGR.FIZZLE",plain
 *=$6000
 
-         ldx   #(end-start)          ; copy LFSR code to zero page
--        ldy   start-1, x
-         sty   $FF, x
+         ldx   #(end-start+1)        ; copy LFSR code to zero page
+-        ldy   start-2, x
+         sty   $81, x
          dex
          bne   -
 
          jmp   loop
 
 start
-!pseudopc 0 {
-         !byte 0
+!pseudopc $83 {
          ;X=0
          ;Y=0
 loop     txa
 loop1    eor   #$05                  ; LFSR form 0x0500 with period 2047
-         ldx   #$80
-wait     dex
-         bne   wait
+wait     inx
+         bpl   wait
          tax
 loop2    tya
          and   #$78
@@ -31,13 +29,14 @@ loop2    tya
          txa
          ora   #$04
          sta   <dst+2
-         lda   <addrs, x
-         bmi   aux
+         txa
+         ;C=0
+         adc   #$7C
+         bpl   aux
          sta   $C004
-         bpl   +                     ; always branches
-aux      and   #$7F
-         sta   $C005
-+        sta   <src+2
+         !byte $24
+aux      sta   $C005
+setsrc   sta   <src+2
 src      lda   $FD00, y              ; SMC high byte
 dst      sta   $FD00, y              ; SMC high byte
 next     txa
@@ -52,14 +51,12 @@ next     txa
          bmi   exit
          txa
          bne   loop1
-exit     lda   $4400                 ; last lousy byte (because LFSR never hits 0)
+exit     lda   $7C00                 ; last lousy byte (because LFSR never hits 0)
+!if *+1 != $C0 {
+         !error *
+}
          sta   $0400
          sta   $C004
          rts
-         ; source data is at $4000-$47FF/main
-         ; $4000-$43FF/main -> $0400-$07FF/aux
-         ; $4400-$47FF/main -> $0400-$07FF/main
-addrs
-         !byte $44,$45,$46,$47,$C0,$C1,$C2,$C3
 }
 end
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index 1574972f1..361c61d55 100644
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10956340
+         !be24  10956327
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 6f26a2660..30d1beff5 100644
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10956788
+         !be24  10956775
          !le16      303
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 416439f7a..0f6b1428a 100644
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@@ -5,4 +5,4 @@
 ;
          !byte 0
          !be24  10956046
-         !le16       93
+         !le16       80
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index e1698351a..83b11416d 100644
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10956139
+         !be24  10956126
          !le16      201
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index db9e39340..fdc05604a 100644
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  10957091
+         !be24  10957078
          !le16     2370
diff --git a/src/ui.attract.dgr.a b/src/ui.attract.dgr.a
index e9b5c6e1f..91f96032e 100644
--- a/src/ui.attract.dgr.a
+++ b/src/ui.attract.dgr.a
@@ -106,8 +106,8 @@ BlankDGR
 LoadIndexedDGRFile
 ; in:    caller has set IndexedDGRFilename
 ; out:   all flags & registers clobbered
-         jsr   LoadIndexedFile       ; load index file into $4A00
--        !word $4A00
+         jsr   LoadIndexedFile       ; load index file into $4000
+-        !word $4000
          !word kDGRActionIndexRecord
 
          jsr   okvs_find
@@ -116,10 +116,9 @@ IndexedDGRFilename
          !word $FDFD                 ; SMC
          +ST16 @indexRecordPtr
 
-         jsr   LoadIndexedFile       ; load entire DGR screenshot at $4000..$47FF
-         !word $4000                 ; because that's where the transition code expects to find it
-                                     ; auxmem half is first ($4000..$43FF)
-                                     ; mainmem half is second ($4400..$47FF)
+         jsr   LoadIndexedFile       ; load entire DGR screenshot at $7C00
+         !word $7C00                 ; because that's where the transition code expects to find it
+                                     ; auxmem half is first, mainmem second
 @indexRecordPtr
          !word $FDFD                 ; SMC
          rts