From 2bb6eb557a59816eade4749a0b8f7de3c3c29d85 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Fri, 31 May 2024 21:01:21 -0400
Subject: [PATCH] factor out more FX routines

---
 src/constants.a                               |  46 ++
 ...ial.common.a => code.dhgr.dither.radial.a} |  13 +-
 ...hgr.radial.common.a => code.dhgr.radial.a} |  13 +-
 src/fx/code.hgr.48boxes.a                     | 496 +++++++++++++++
 ...dial.common.a => code.hgr.dither.radial.a} |  10 +-
 src/fx/fx.dhgr.48boxes.2snakes.a              |  32 +-
 src/fx/fx.dhgr.48boxes.a                      |  64 +-
 src/fx/fx.dhgr.48boxes.arrow.a                |  32 +-
 src/fx/fx.dhgr.48boxes.common.a               |  68 +--
 src/fx/fx.dhgr.48boxes.down.a                 |  32 +-
 src/fx/fx.dhgr.48boxes.longdiagonal.a         |  32 +-
 src/fx/fx.dhgr.48boxes.pageturn.clear.a       |  64 +-
 src/fx/fx.dhgr.48boxes.sidetoside.a           |  32 +-
 src/fx/fx.dhgr.48boxes.snake.a                |  32 +-
 src/fx/fx.dhgr.48boxes.snake.clear.a          |  64 +-
 src/fx/fx.dhgr.48boxes.spiral.a               |  32 +-
 src/fx/fx.dhgr.48boxes.spiral.clear.a         |  64 +-
 src/fx/fx.dhgr.48boxes.sync.a                 |  32 +-
 src/fx/fx.dhgr.48boxes.sync.clear.a           |  64 +-
 src/fx/fx.dhgr.dither.radial2.a               |   8 +-
 src/fx/fx.dhgr.dither.radial4.a               |   8 +-
 src/fx/fx.dhgr.radial2.a                      |   8 +-
 src/fx/fx.dhgr.radial4.a                      |   8 +-
 src/fx/fx.dhgr.radial5.a                      |   8 +-
 src/fx/fx.hgr.48boxes.a                       |   1 +
 src/fx/fx.hgr.48boxes.common.a                | 570 +-----------------
 src/fx/fx.hgr.dither.radial2.a                |   8 +-
 src/fx/fx.hgr.dither.radial4.a                |   8 +-
 src/fx/fx.hgr.dither.radial5.a                |   8 +-
 src/index/artwork.idx.a                       |   2 +-
 src/index/attract.idx.a                       |   2 +-
 src/index/cache00.idx.a                       |   2 +-
 src/index/cache01.idx.a                       |   2 +-
 src/index/cache10.idx.a                       |   2 +-
 src/index/cache11.idx.a                       |   2 +-
 src/index/coverfade.idx.a                     |   2 +-
 src/index/credits.idx.a                       |   2 +-
 src/index/decrunch.idx.a                      |   2 +-
 src/index/demo.idx.a                          |   2 +-
 src/index/dfx.idx.a                           |   2 +-
 src/index/dgr.fizzle.idx.a                    |   2 +-
 src/index/dgr.idx.a                           |   2 +-
 src/index/dhgr.idx.a                          |   2 +-
 src/index/dtitle.idx.a                        |   2 +-
 src/index/fx.idx.a                            |   2 +-
 src/index/fxcode.idx.a                        |   4 +-
 src/index/fxdata.idx.a                        |   2 +-
 src/index/gamehelp.idx.a                      |   2 +-
 src/index/gr.fizzle.idx.a                     |   2 +-
 src/index/gr.idx.a                            |   2 +-
 src/index/helptext.idx.a                      |   2 +-
 src/index/hgr0.idx.a                          |   2 +-
 src/index/hgr1.idx.a                          |   2 +-
 src/index/hgr2.idx.a                          |   2 +-
 src/index/hgr3.idx.a                          |   2 +-
 src/index/hgr4.idx.a                          |   2 +-
 src/index/hgr5.idx.a                          |   2 +-
 src/index/hgr6.idx.a                          |   2 +-
 src/index/joystick.idx.a                      |   2 +-
 src/index/miniattract0.idx.a                  |   2 +-
 src/index/miniattract1.idx.a                  |   2 +-
 src/index/prelaunch.idx.a                     |   2 +-
 src/index/search00.idx.a                      |   2 +-
 src/index/search01.idx.a                      |   2 +-
 src/index/search10.idx.a                      |   2 +-
 src/index/search11.idx.a                      |   2 +-
 src/index/sfx.idx.a                           |   2 +-
 src/index/slideshow.idx.a                     |   2 +-
 src/index/title.idx.a                         |   2 +-
 src/index/xsingle.idx.a                       |   2 +-
 70 files changed, 993 insertions(+), 948 deletions(-)
 rename src/fx/{fx.dhgr.dither.radial.common.a => code.dhgr.dither.radial.a} (94%)
 rename src/fx/{fx.dhgr.radial.common.a => code.dhgr.radial.a} (93%)
 create mode 100644 src/fx/code.hgr.48boxes.a
 rename src/fx/{fx.hgr.dither.radial.common.a => code.hgr.dither.radial.a} (93%)

diff --git a/src/constants.a b/src/constants.a
index dee91f8ab..68571414b 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -205,6 +205,52 @@ hgrhi3b        = $6C00               ; $80 bytes
 hgrhi3c        = $BD01               ; $80 bytes
 extra_cols     = $BEF8               ; $08 bytes
 
+; hgr.48boxes constants
+StageDrawingRoutines = $7F00
+; High bytes of drawing routines for each stage (actual routines will be page-aligned).
+; To minimize code size, we build drawing routines in this order:
+; - copy01 (STAGE1 template)
+; - copy00 (STAGE0 template)
+; - copy0F..copy09 (OUTER_STAGE template)
+; - copy08..copy02 (MIDDLE_STAGE template)
+; - change some opcodes to turn the 'copy' routines into 'clear' routines
+; - clear0F..clear08 (OUTER_STAGE)
+; - clear07..clear02 (MIDDLE_STAGE)
+; - clear01 (STAGE1)
+; - clear00 (STAGE0)
+clear00  = $80
+clear01  = $81
+clear02  = $82
+clear03  = $83
+clear04  = $84
+clear05  = $85
+clear06  = $86
+clear07  = $87
+clear08  = $88
+clear09  = $89
+clear0A  = $8A
+clear0B  = $8B
+clear0C  = $8C
+clear0D  = $8D
+clear0E  = $8E
+clear0F  = $8F
+copy02   = $90
+copy03   = $91
+copy04   = $92
+copy05   = $93
+copy06   = $94
+copy07   = $95
+copy08   = $96
+copy09   = $97
+copy0A   = $98
+copy0B   = $99
+copy0C   = $9A
+copy0D   = $9B
+copy0E   = $9C
+copy0F   = $9D
+copy00   = $9E
+copy01   = $9F
+
 ; LC RAM 1 & 2 addresses
 ; these are defined here because they are also called by other targets
 ; that are assembled separately, e.g. prelaunchers, demo launchers, and graphic effects
diff --git a/src/fx/fx.dhgr.dither.radial.common.a b/src/fx/code.dhgr.dither.radial.a
similarity index 94%
rename from src/fx/fx.dhgr.dither.radial.common.a
rename to src/fx/code.dhgr.dither.radial.a
index c2a55bd5f..f768a89de 100644
--- a/src/fx/fx.dhgr.dither.radial.common.a
+++ b/src/fx/code.dhgr.dither.radial.a
@@ -2,6 +2,13 @@
 ;(c) 2019-2022 by 4am
 ;
 
+!cpu 6502
+!to "build/FXCODE/DHGRDITHRAD",plain
+*=$6200
+
+         !source "src/fx/macros.a"
+
+;DHGRDitherRadialPrecomputed1Bit
 evenrow_ptr    = $E4      ; word
 oddrow_ptr     = $E6      ; word
 mirror_src1    = $E8      ; word
@@ -20,7 +27,7 @@ input          = $FE      ; word
          jsr   iBuildHGRTables
          jsr   iBuildHGRMirrorTables
          jsr   iBuildDHGRMirrorCols
-         +COPY_TO_AUXMEM $60, 4
+         +COPY_TO_AUXMEM $62, 4
 
          +LDADDR evenrow_masks
          +ST16 evenrow_ptr
@@ -34,9 +41,9 @@ input          = $FE      ; word
          sta   <oddrow_ptr
          ; /!\ execution falls through here
 FullRadial
-         +LDADDR Coordinates
+         +LDADDR Coordinates1Bit
          +ST16 input
-         +LDADDR EndCoordinates-2
+         +LDADDR EndCoordinates1Bit-2
          +ST16 reverse_input
          +HIDE_NEXT_BYTE
 Exit     rts
diff --git a/src/fx/fx.dhgr.radial.common.a b/src/fx/code.dhgr.radial.a
similarity index 93%
rename from src/fx/fx.dhgr.radial.common.a
rename to src/fx/code.dhgr.radial.a
index 575650ed0..457771009 100644
--- a/src/fx/fx.dhgr.radial.common.a
+++ b/src/fx/code.dhgr.radial.a
@@ -2,6 +2,12 @@
 ;(c) 2019-2022 by 4am
 ;
 
+!cpu 6502
+!to "build/FXCODE/DHGRRADIAL",plain
+*=$6200
+
+         !source "src/fx/macros.a"
+
 mirror_src1    = $E8      ; word
 mirror_dest1   = $EA      ; word
 mirror_src2    = $EC      ; word
@@ -13,15 +19,16 @@ dest2          = $F6      ; word
 reverse_input  = $FC      ; word
 input          = $FE      ; word
 
+;DHGRRadialPrecomputed1Bit
          jsr   iBuildDHGRSparseBitmasks1Bit
          jsr   iBuildHGRTables
          jsr   iBuildHGRMirrorTables
          jsr   iBuildDHGRMirrorCols
-         +COPY_TO_AUXMEM $60, 4
+         +COPY_TO_AUXMEM $62, 4
 
-         +LDADDR Coordinates
+         +LDADDR Coordinates1Bit
          +ST16 input
-         +LDADDR EndCoordinates-2
+         +LDADDR EndCoordinates1Bit-2
          +ST16 reverse_input
          jmp   Loop
 Exit     rts
diff --git a/src/fx/code.hgr.48boxes.a b/src/fx/code.hgr.48boxes.a
new file mode 100644
index 000000000..359ac4439
--- /dev/null
+++ b/src/fx/code.hgr.48boxes.a
@@ -0,0 +1,496 @@
+;license:MIT
+;(c) 2020 by 4am & qkumba
+;
+!cpu 6502
+!to "build/FXCODE/HGR48",plain
+*=$6200
+
+; The screen is separated into 48 boxes.
+; Boxes are laid out in a grid, left-to-right, top-down:
+;
+; 0  1  2  3  4  5  6  7
+; 8  9  10 11 12 13 14 15
+; 16 17 18 19 20 21 22 23
+; 24 25 26 27 28 29 30 31
+; 32 33 34 35 36 37 38 39
+; 40 41 42 43 44 45 46 47
+;
+; Each box is 35x32 pixels, so each row of each box is 5 consecutive
+; bytes in memory once you calculate the HGR base address for that row.
+;
+; |BoxInitialStages| defines the initial grid of stages for each box.
+; Each stage is used as an index into the |StagesHi| array
+; to find the drawing routine for that stage (if any).
+; Each box's stage is incremented after each iteration through the main loop.
+; When the main loop iterates through all 48 boxes without drawing anything,
+; the program exits.
+;
+; There are 16 clear routines that set certain bits to 0 (black),
+; labeled clear00..clear0F. clear00 clears the inner-most box, and
+; clear0F clears the outermost box (see diagram).
+; There are 16 copy routines that copy certain bits from the source
+; image on page 2 to the destination image on page 1, labeled copy00..copy0F.
+;
+; row|                 bits
+; ---+---------------------------------------
+; 00 |FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF
+; 01 |FEEEEEE|EEEEEEE|EEEEEEE|EEEEEEE|EEEEEEF
+; 02 |FEDDDDD|DDDDDDD|DDDDDDD|DDDDDDD|DDDDDEF
+; 03 |FEDCCCC|CCCCCCC|CCCCCCC|CCCCCCC|CCCCDEF
+; 04 |FEDCBBB|BBBBBBB|BBBBBBB|BBBBBBB|BBBCDEF
+; 05 |FEDCBAA|AAAAAAA|AAAAAAA|AAAAAAA|AABCDEF
+; 06 |FEDCBA9|9999999|9999999|9999999|9ABCDEF
+; 07 |FEDCBA9|8888888|8888888|8888888|9ABCDEF
+; ---+-------+-------+-------+-------+-------
+; 08 |FEDCBA9|8777777|7777777|7777778|9ABCDEF
+; 09 |FEDCBA9|8766666|6666666|6666678|9ABCDEF
+; 0A |FEDCBA9|8765555|5555555|5555678|9ABCDEF
+; 0B |FEDCBA9|8765444|4444444|4445678|9ABCDEF
+; 0C |FEDCBA9|8765433|3333333|3345678|9ABCDEF
+; 0D |FEDCBA9|8765432|2222222|2345678|9ABCDEF
+; 0E |FEDCBA9|8765432|1111111|2345678|9ABCDEF
+; 0F |FEDCBA9|8765432|1000001|2345678|9ABCDEF
+; ---+-------+-------+-------+-------+-------
+; 10 |FEDCBA9|8765432|1000001|2345678|9ABCDEF
+; 11 |FEDCBA9|8765432|1111111|2345678|9ABCDEF
+; 12 |FEDCBA9|8765432|2222222|2345678|9ABCDEF
+; 13 |FEDCBA9|8765433|3333333|3345678|9ABCDEF
+; 14 |FEDCBA9|8765444|4444444|4445678|9ABCDEF
+; 15 |FEDCBA9|8765555|5555555|5555678|9ABCDEF
+; 16 |FEDCBA9|8766666|6666666|6666678|9ABCDEF
+; 17 |FEDCBA9|8777777|7777777|7777778|9ABCDEF
+; ---+-------+-------+-------+-------+-------
+; 18 |FEDCBA9|8888888|8888888|8888888|9ABCDEF
+; 19 |FEDCBA9|9999999|9999999|9999999|9ABCDEF
+; 1A |FEDCBAA|AAAAAAA|AAAAAAA|AAAAAAA|AABCDEF
+; 1B |FEDCBBB|BBBBBBB|BBBBBBB|BBBBBBB|BBBCDEF
+; 1C |FEDCCCC|CCCCCCC|CCCCCCC|CCCCCCC|CCCCDEF
+; 1D |FEDDDDD|DDDDDDD|DDDDDDD|DDDDDDD|DDDDDEF
+; 1E |FEEEEEE|EEEEEEE|EEEEEEE|EEEEEEE|EEEEEEF
+; 1F |FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF
+;
+
+src      = $00                       ; [word][must be at $00] (drawing phase)
+dst      = $02                       ; [word] (drawing phase)
+rowcount = $04                       ; [byte] (drawing phase)
+BoxesX   = $90                       ; [$30 bytes] starting row for each box (build phase)
+BoxesY   = $C0                       ; [$30 bytes] starting byte offset for each box (build phase)
+
+; tokens for code generation
+; used as indexes into |codegen_pieces| and |codegen_piece_lengths|,
+; so keep all three in sync
+k_rts                     = 0        ; must be 0
+k_inx_and_recalc          = 1
+k_recalc                  = 2
+k_recalc_and_iny          = 3
+k_stage_init              = 4
+k_maskcopy_pre            = 5
+k_maskcopy_post_and_iny   = 6
+k_maskcopy_post           = 7
+k_copy_and_iny            = 8
+k_copy                    = 9
+k_dey2                    = 10
+k_iny2                    = 11
+k_middle_branches         = 12
+k_outer_branches          = 13
+k_edge_left_mask          = 14
+k_edge_right_mask         = 15
+k_left_mask               = 16
+k_right_mask              = 17
+
+         !source "src/fx/macros.a"
+
+; actual code starts here
+
+         ; drawing routines for each stage are constructed dynamically
+         ; and stored at copy00..copy0F and clear00..clear0F
+         jsr   BuildDrawingRoutines
+
+         +COPY_TO_0 start-5, end
+
+         jsr   iBuildHGRTables
+
+; Generate |BoxesX| and |BoxesY| arrays
+; BoxesX (starting row for each box)
+;  $00,$00,$00,$00,$00,$00,$00,$00
+;  $20,$20,$20,$20,$20,$20,$20,$20
+;  $40,$40,$40,$40,$40,$40,$40,$40
+;  $60,$60,$60,$60,$60,$60,$60,$60
+;  $80,$80,$80,$80,$80,$80,$80,$80
+;  $A0,$A0,$A0,$A0,$A0,$A0,$A0,$A0
+; BoxesY (starting byte offset for each box)
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+;  $00,$05,$0A,$0F,$14,$19,$1E,$23
+         ldx   #48
+         ldy   #$A0
+         lda   #$23
+         pha
+-        tya
+         sta   BoxesX-1, x
+         pla
+         sta   BoxesY-1, x
+         sec
+         sbc   #5
+         bcs   +
+         lda   #$23
++        pha
+         dex
+         txa
+         and   #7
+         bne   -
+         tya
+         sec
+         sbc   #$20
+         tay
+         txa
+         bne   -
+         pla
+
+; These are all the pieces of code we need to construct the drawing routines.
+; There are 32 drawing routines, which we construct from
+; four templates (below). Templates use tokens to refer to these code pieces.
+; Note that several pieces overlap in order to minimize code size.
+; Everything from CODEGEN_COPY_START and onward is copied to zero page for
+; the code generation phase on program startup.
+CODEGEN_COPY_START
+!pseudopc 0 {
+RTS0                                 ; 1 byte
+         rts
+RTS0_E
+INX_AND_RECALC                       ; 16 bytes
+         inx
+RECALC_AND_INY                       ; 16 bytes
+RECALC                               ; 15 bytes
+         lda   hgrlo, x
+         sta   <src
+         sta   <dst
+         lda   hgrhi, x
+         sta   <dst+1
+         eor   #$60
+         sta   <src+1
+RECALC_E
+INX_AND_RECALC_E
+         iny
+RECALC_AND_INY_E
+STAGE_INIT                           ; 8 bytes
+ROW_COUNT=*+1
+         ldx   #$1F                  ; SMC
+         stx   <rowcount
+FIRST_ROW=*+1
+         adc   #$0E                  ; SMC
+         tax
+STAGE_INIT_E
+MASKCOPY_PRE                         ; 5 bytes
+         lda   (dst), y
+BIT_FOR_CLEAR
+         eor   (src), y
+         !byte $29                   ; (AND #$44 opcode)
+MASKCOPY_PRE_E
+MASKCOPY_POST_AND_INY                ; 5 bytes
+MASKCOPY_POST                        ; 4 bytes
+         eor   (dst), y
+         sta   (dst), y
+MASKCOPY_POST_E
+         iny
+MASKCOPY_POST_AND_INY_E
+COPY_AND_INY                         ; 5 bytes
+COPY                                 ; 4 bytes
+         lda   (src), y
+         sta   (dst), y
+COPY_E
+INY2                                 ; 2 bytes
+         iny
+COPY_AND_INY_E
+         iny
+INY2_E
+DEY2                                 ; 2 bytes
+         dey
+         dey
+DEY2_E
+MIDDLE_BRANCHES                      ; 6 bytes
+         dec   <rowcount
+         ; these monsters avoid hard-coded branching
+         ; trailing -2 for dec rowcount, -2 for branch itself
+         !byte $F0,MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_LEFT_MASK-EDGE_LEFT_MASK_E+MASKCOPY_POST_AND_INY-MASKCOPY_POST_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_RIGHT_MASK-EDGE_RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2
+         ; another -2 for the previous branch as well
+         !byte $10,MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2-2
+MIDDLE_BRANCHES_E
+OUTER_BRANCHES                       ; 6 bytes
+         dec   <rowcount
+         ; these monsters avoid hard-coded branching
+         ; trailing -2 for dec rowcount, -2 for branch itself
+         !byte $F0,MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_LEFT_MASK-EDGE_LEFT_MASK_E+MASKCOPY_POST_AND_INY-MASKCOPY_POST_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_RIGHT_MASK-EDGE_RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2
+         ; another -2 for the previous branch as well
+         !byte $10,MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2-2
+OUTER_BRANCHES_E
+EDGE_LEFT_MASK   = $FC
+EDGE_LEFT_MASK_E = $FD
+EDGE_RIGHT_MASK  = $FD
+EDGE_RIGHT_MASK_E = $FE
+LEFT_MASK         = $FE
+LEFT_MASK_E       = $FF
+RIGHT_MASK        = $FF
+RIGHT_MASK_E      = $100
+
+codegen_piece_lengths                ; length of each of the pieces
+         !byte RTS0_E-RTS0
+         !byte INX_AND_RECALC_E-INX_AND_RECALC
+         !byte RECALC_E-RECALC
+         !byte RECALC_AND_INY_E-RECALC_AND_INY
+         !byte STAGE_INIT_E-STAGE_INIT
+         !byte MASKCOPY_PRE_E-MASKCOPY_PRE
+         !byte MASKCOPY_POST_AND_INY_E-MASKCOPY_POST_AND_INY
+         !byte MASKCOPY_POST_E-MASKCOPY_POST
+         !byte COPY_AND_INY_E-COPY_AND_INY
+         !byte COPY_E-COPY
+         !byte DEY2_E-DEY2
+         !byte INY2_E-INY2
+         !byte MIDDLE_BRANCHES_E-MIDDLE_BRANCHES
+         !byte OUTER_BRANCHES_E-OUTER_BRANCHES
+         !byte EDGE_LEFT_MASK_E-EDGE_LEFT_MASK
+         !byte EDGE_RIGHT_MASK_E-EDGE_RIGHT_MASK
+         !byte LEFT_MASK_E-LEFT_MASK
+         !byte RIGHT_MASK_E-RIGHT_MASK
+
+codegen_pieces                       ; address of each of the pieces (on zero page, so 1 byte)
+         !byte <RTS0
+         !byte <INX_AND_RECALC
+         !byte <RECALC
+         !byte <RECALC_AND_INY
+         !byte <STAGE_INIT
+         !byte <MASKCOPY_PRE
+         !byte <MASKCOPY_POST_AND_INY
+         !byte <MASKCOPY_POST
+         !byte <COPY_AND_INY
+         !byte <COPY
+         !byte <DEY2
+         !byte <INY2
+         !byte <MIDDLE_BRANCHES
+         !byte <OUTER_BRANCHES
+         !byte <EDGE_LEFT_MASK
+         !byte <EDGE_RIGHT_MASK
+         !byte <LEFT_MASK
+         !byte <RIGHT_MASK
+
+; Template for 'stage 0' routine (copy00), which copies the innermost
+; part of the box (labeled '0' in diagram above).
+STAGE0
+         !byte k_stage_init
+         !byte k_recalc
+         !byte k_iny2
+         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
+         !byte k_inx_and_recalc
+         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
+         !byte k_rts                 ; also serves as an end-of-template marker
+
+; Template for 'stage 1' routine (copy01), which copies the pixels
+; around the innermost box (labeled '1' in diagram above).
+STAGE1
+         !byte k_stage_init
+         !byte k_recalc
+         !byte k_iny2
+         !byte k_copy
+         !byte k_inx_and_recalc
+         !byte k_copy
+         !byte k_inx_and_recalc
+         !byte k_copy
+         !byte k_inx_and_recalc
+         !byte k_copy
+         !byte k_rts                 ; also serves as an end-of-template marker
+
+; Template for stages 2-8 (copy02..copy08)
+MIDDLE_STAGE
+         !byte k_stage_init
+         !byte k_recalc_and_iny
+         !byte k_maskcopy_pre, k_edge_left_mask, k_maskcopy_post_and_iny
+         !byte k_copy_and_iny
+         !byte k_maskcopy_pre, k_edge_right_mask, k_maskcopy_post
+         !byte k_dey2
+         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
+         !byte k_iny2
+         !byte k_maskcopy_pre, k_right_mask, k_maskcopy_post
+         !byte k_dey2
+         !byte k_inx_and_recalc
+         !byte k_middle_branches
+         !byte k_rts                 ; also serves as an end-of-template marker
+
+; Template for stages 9-15 (copy09..copy0F)
+OUTER_STAGE
+         !byte k_stage_init
+         !byte k_recalc
+         !byte k_maskcopy_pre, k_edge_left_mask, k_maskcopy_post_and_iny
+         !byte k_copy_and_iny
+         !byte k_copy_and_iny
+         !byte k_copy_and_iny
+         !byte k_maskcopy_pre, k_edge_right_mask, k_maskcopy_post
+         !byte k_dey2
+         !byte k_dey2
+         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
+         !byte k_iny2
+         !byte k_iny2
+         !byte k_maskcopy_pre, k_right_mask, k_maskcopy_post
+         !byte k_dey2
+         !byte k_dey2
+         !byte k_inx_and_recalc
+         !byte k_outer_branches
+         !byte k_rts                 ; also serves as an end-of-template marker
+
+EdgeRightMasks
+         !byte %10000001
+         !byte %10000011
+         !byte %10000111
+         !byte %10001111
+         !byte %10011111
+         !byte %10111111
+         !byte %11111111
+LeftMasks
+         !byte %11000000
+         !byte %10100000
+         !byte %10010000
+         !byte %10001000
+         !byte %10000100
+         !byte %10000010
+RightMasks
+         !byte %10000001             ; also the last item in LeftMasks
+         !byte %10000010
+         !byte %10000100
+         !byte %10001000
+         !byte %10010000
+         !byte %10100000
+EdgeLeftMasks
+         !byte %11000000             ; also the last item in RightMasks
+         !byte %11100000
+         !byte %11110000
+         !byte %11111000
+         !byte %11111100
+         !byte %11111110
+         !byte %11111111
+
+codegen_stage
+         !byte 27
+codegen_maskindex
+         !byte 0
+
+BuildDrawingRoutineFrom
+         sta   <codegen_token_src
+BuildDrawingRoutine
+         ldy   #0
+         sty   <codegen_token_x
+BuildTokenLoop
+codegen_token_x=*+1
+         ldx   #$00
+codegen_token_src=*+1
+         lda   <OUTER_STAGE, x
+         inc   <codegen_token_x
+         pha
+         tax
+         lda   <codegen_piece_lengths, x
+         sta   <piece_length
+         lda   <codegen_pieces, x
+         sta   <piece_src
+         ldx   #0
+BuildPieceLoop
+piece_src=*+1
+         lda   $FD, x                ; SMC
+         !byte $99,$00               ; STA $4400, Y
+codegen_dst
+         !byte copy01                ; SMC
+         iny
+         inx
+piece_length=*+1
+         cpx   #$FD                  ; SMC
+         bcc   BuildPieceLoop
+         pla
+         bne   BuildTokenLoop
+         dec   <codegen_dst
+         inc   <FIRST_ROW
+         rts
+}
+
+BuildDrawingRoutines
+         ; copy codegen data to zero page
+         ldx   #0
+-        lda   CODEGEN_COPY_START, x
+         sta   $00, x
+         inx
+         bne   -
+
+         ; generate drawing routines for copy01, then copy00
+         jsr   BuildStage1And0
+         ; A=0 here
+         sta   <FIRST_ROW
+
+         ; generate drawing routines for copy0F..copy02, then clear0F..clear02
+         lda   #<MIDDLE_STAGE
+---      eor   #(<OUTER_STAGE XOR <MIDDLE_STAGE)
+         sta   <codegen_token_src
+         ldx   #6
+--       stx   <codegen_maskindex
+         lda   <EdgeLeftMasks, x
+         sta   <EDGE_LEFT_MASK
+         lda   <EdgeRightMasks, x
+         sta   <EDGE_RIGHT_MASK
+         lda   <LeftMasks, x
+         sta   <LEFT_MASK
+         lda   <RightMasks, x
+         sta   <RIGHT_MASK
+         jsr   BuildDrawingRoutine
+         dec   <ROW_COUNT
+         dec   <ROW_COUNT
+         dec   <codegen_stage
+         bmi   BuildStage1And0
+         lda   <codegen_stage
+         eor   #13
+         bne   +
+         sta   <FIRST_ROW
+         lda   #$1F
+         sta   <ROW_COUNT
+         lda   #$A9
+         sta   <COPY
+         lda   #$24
+         sta   <BIT_FOR_CLEAR
++        lda   <codegen_token_src
+         ldx   <codegen_maskindex
+         dex
+         bmi   ---
+         bpl   --                    ; always branches
+
+         ; generate drawing routines for copy01, copy00 (or clear01, clear00)
+BuildStage1And0
+         lda   #%10111110
+         sta   <LEFT_MASK
+         lda   #<STAGE1
+         jsr   BuildDrawingRoutineFrom
+         lda   #<STAGE0
+         jmp   BuildDrawingRoutineFrom
+
+start
+!pseudopc 5 {
+MainLoop ldx   #47
+BoxLoop  ldy   <BoxStages, x         ; for each box, get its current stage
+         inc   <BoxStages, x         ; increment every box's stage every time through the loop
+         lda   StageDrawingRoutines, y
+         beq   <NextBox              ; if stage's drawing routine is 0, nothing to do
+         sta   <j+2
+         lda   <BoxesX, x            ; A = starting HGR row for this box
+         ldy   <BoxesY, x            ; Y = starting byte offset for this box
+         clc
+         stx   <ReBox+1
+j        jsr   $0000                 ; [SMC] call drawing routine for this stage
+ReBox    ldx   #$FD                  ; [SMC]
+NextBox  dex
+         bpl   <BoxLoop
+         lda   <j+2
+         bpl   +                     ; if we didn't draw anything in any box, we're done
+         lda   KBD
+         sta   <j+2
+         bpl   <MainLoop
++        rts
+BoxStages
+!if (BoxStages != $2D) { !serious "BoxStages=",* }
+}
+end
diff --git a/src/fx/fx.hgr.dither.radial.common.a b/src/fx/code.hgr.dither.radial.a
similarity index 93%
rename from src/fx/fx.hgr.dither.radial.common.a
rename to src/fx/code.hgr.dither.radial.a
index 39af0b071..e097d6a9e 100644
--- a/src/fx/fx.hgr.dither.radial.common.a
+++ b/src/fx/code.hgr.dither.radial.a
@@ -1,6 +1,11 @@
 ;license:MIT
 ;(c) 2019-2022 by 4am
 ;
+!cpu 6502
+!to "build/FXCODE/HGRDITHERRADIAL",plain
+*=$6200
+
+         !source "src/fx/macros.a"
 
 evenrow_ptr    = $E4      ; word
 oddrow_ptr     = $E6      ; word
@@ -15,6 +20,7 @@ dest2          = $F6      ; word
 reverse_input  = $FC      ; word
 input          = $FE      ; word
 
+;HGRDitherRadialPrecomputed1Bit
          jsr   iBuildHGRDitherMasks
          jsr   iBuildHGRMirrorCols
          jsr   iBuildHGRTables
@@ -33,9 +39,9 @@ input          = $FE      ; word
          sta   <oddrow_ptr
          ; /!\ execution falls through here
 FullRadial
-         +LDADDR Coordinates
+         +LDADDR Coordinates1Bit
          +ST16 input
-         +LDADDR EndCoordinates-2
+         +LDADDR EndCoordinates1Bit-2
          +ST16 reverse_input
          +HIDE_NEXT_BYTE
 Exit     rts
diff --git a/src/fx/fx.dhgr.48boxes.2snakes.a b/src/fx/fx.dhgr.48boxes.2snakes.a
index dce92b688..1726243a0 100644
--- a/src/fx/fx.dhgr.48boxes.2snakes.a
+++ b/src/fx/fx.dhgr.48boxes.2snakes.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $D2,$D4,$D6,$D8,$FA,$FC,$FE,$00
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.a b/src/fx/fx.dhgr.48boxes.a
index cc3971b24..d3d331c3b 100644
--- a/src/fx/fx.dhgr.48boxes.a
+++ b/src/fx/fx.dhgr.48boxes.a
@@ -15,38 +15,38 @@
          !byte $00,$FC,$F8,$F4,$F0,$EC,$E8,$E4
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte clear00
-         !byte clear01
-         !byte clear02
-         !byte clear03
-         !byte clear04
-         !byte clear05
-         !byte clear06
-         !byte clear07
-         !byte clear08
-         !byte clear09
-         !byte clear0A
-         !byte clear0B
-         !byte clear0C
-         !byte clear0D
-         !byte clear0E
-         !byte clear0F
+         !byte dhgr_clear00
+         !byte dhgr_clear01
+         !byte dhgr_clear02
+         !byte dhgr_clear03
+         !byte dhgr_clear04
+         !byte dhgr_clear05
+         !byte dhgr_clear06
+         !byte dhgr_clear07
+         !byte dhgr_clear08
+         !byte dhgr_clear09
+         !byte dhgr_clear0A
+         !byte dhgr_clear0B
+         !byte dhgr_clear0C
+         !byte dhgr_clear0D
+         !byte dhgr_clear0E
+         !byte dhgr_clear0F
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.arrow.a b/src/fx/fx.dhgr.48boxes.arrow.a
index 1097423c3..39a591802 100644
--- a/src/fx/fx.dhgr.48boxes.arrow.a
+++ b/src/fx/fx.dhgr.48boxes.arrow.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $F9,$F7,$F3,$F1,$ED,$EB,$E7,$E5
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.common.a b/src/fx/fx.dhgr.48boxes.common.a
index b50316d82..f5ac29396 100644
--- a/src/fx/fx.dhgr.48boxes.common.a
+++ b/src/fx/fx.dhgr.48boxes.common.a
@@ -81,8 +81,6 @@ tmpy     = $05                       ; [byte] used by drawing routines
 box      = $0E                       ; [byte] counter in main loop
 BoxStages = $10                      ; [$30 bytes] current stage for each box
 auxsrc_hgrhi = $BD01                 ; [$C0 bytes] HGR base addresses (hi) starting at $9000
-;hgrlo    = $0201                     ; [$C0 bytes] HGR base addresses (lo) starting at $2000 (defined in constants.a)
-;hgrhi    = $0301                     ; [$C0 bytes] HGR base addresses (hi) starting at $2000 (defined in constants.a)
 BoxesX   = $BE90                     ; [$30 bytes] starting row for each box
 BoxesY   = $BEC0                     ; [$30 bytes] starting byte offset for each box
 
@@ -97,38 +95,38 @@ BoxesY   = $BEC0                     ; [$30 bytes] starting byte offset for each
 ; - clear07..clear02 (MIDDLE_STAGE)
 ; - clear01 (STAGE1)
 ; - clear00 (STAGE0)
-clear00  = $70
-clear01  = $71
-clear02  = $72
-clear03  = $73
-clear04  = $74
-clear05  = $75
-clear06  = $76
-clear07  = $77
-clear08  = $78
-clear09  = $79
-clear0A  = $7A
-clear0B  = $7B
-clear0C  = $7C
-clear0D  = $7D
-clear0E  = $7E
-clear0F  = $7F
-copy02   = $80
-copy03   = $81
-copy04   = $82
-copy05   = $83
-copy06   = $84
-copy07   = $85
-copy08   = $86
-copy09   = $87
-copy0A   = $88
-copy0B   = $89
-copy0C   = $8A
-copy0D   = $8B
-copy0E   = $8C
-copy0F   = $8D
-copy00   = $8E
-copy01   = $8F
+dhgr_clear00  = $70
+dhgr_clear01  = $71
+dhgr_clear02  = $72
+dhgr_clear03  = $73
+dhgr_clear04  = $74
+dhgr_clear05  = $75
+dhgr_clear06  = $76
+dhgr_clear07  = $77
+dhgr_clear08  = $78
+dhgr_clear09  = $79
+dhgr_clear0A  = $7A
+dhgr_clear0B  = $7B
+dhgr_clear0C  = $7C
+dhgr_clear0D  = $7D
+dhgr_clear0E  = $7E
+dhgr_clear0F  = $7F
+dhgr_copy02   = $80
+dhgr_copy03   = $81
+dhgr_copy04   = $82
+dhgr_copy05   = $83
+dhgr_copy06   = $84
+dhgr_copy07   = $85
+dhgr_copy08   = $86
+dhgr_copy09   = $87
+dhgr_copy0A   = $88
+dhgr_copy0B   = $89
+dhgr_copy0C   = $8A
+dhgr_copy0D   = $8B
+dhgr_copy0E   = $8C
+dhgr_copy0F   = $8D
+dhgr_copy00   = $8E
+dhgr_copy01   = $8F
 
 ; tokens for code generation
 ; used as indexes into |codegen_pieces| and |codegen_piece_lengths|,
@@ -589,7 +587,7 @@ piece_src=*+1
          lda   $FD, x                ; SMC
          !byte $99,$00               ; STA $4400, Y
 codegen_dst
-         !byte copy01                ; SMC
+         !byte dhgr_copy01           ; SMC
          iny
          inx
 piece_length=*+1
diff --git a/src/fx/fx.dhgr.48boxes.down.a b/src/fx/fx.dhgr.48boxes.down.a
index 4b96c86fb..ead8f7552 100644
--- a/src/fx/fx.dhgr.48boxes.down.a
+++ b/src/fx/fx.dhgr.48boxes.down.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $F6,$F5,$F6,$F5,$F6,$F5,$F6,$F5
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.longdiagonal.a b/src/fx/fx.dhgr.48boxes.longdiagonal.a
index ccbfa95c7..252793537 100644
--- a/src/fx/fx.dhgr.48boxes.longdiagonal.a
+++ b/src/fx/fx.dhgr.48boxes.longdiagonal.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $F6,$F4,$F2,$F0,$EE,$EC,$EA,$E8
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.pageturn.clear.a b/src/fx/fx.dhgr.48boxes.pageturn.clear.a
index 257a2d67f..60a8f2e06 100644
--- a/src/fx/fx.dhgr.48boxes.pageturn.clear.a
+++ b/src/fx/fx.dhgr.48boxes.pageturn.clear.a
@@ -15,37 +15,37 @@
          !byte $FF,$00,$FF,$00,$FF,$00,$FF,$00
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte clear0F
-         !byte clear0E
-         !byte clear0D
-         !byte clear0C
-         !byte clear0B
-         !byte clear0A
-         !byte clear09
-         !byte clear08
-         !byte clear07
-         !byte clear06
-         !byte clear05
-         !byte clear04
-         !byte clear03
-         !byte clear02
-         !byte clear01
-         !byte clear00
+         !byte dhgr_clear0F
+         !byte dhgr_clear0E
+         !byte dhgr_clear0D
+         !byte dhgr_clear0C
+         !byte dhgr_clear0B
+         !byte dhgr_clear0A
+         !byte dhgr_clear09
+         !byte dhgr_clear08
+         !byte dhgr_clear07
+         !byte dhgr_clear06
+         !byte dhgr_clear05
+         !byte dhgr_clear04
+         !byte dhgr_clear03
+         !byte dhgr_clear02
+         !byte dhgr_clear01
+         !byte dhgr_clear00
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.sidetoside.a b/src/fx/fx.dhgr.48boxes.sidetoside.a
index 3eec14e60..974e1e2e8 100644
--- a/src/fx/fx.dhgr.48boxes.sidetoside.a
+++ b/src/fx/fx.dhgr.48boxes.sidetoside.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $E4,$E8,$EC,$F0,$F4,$F8,$FC,$00
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.snake.a b/src/fx/fx.dhgr.48boxes.snake.a
index de982eb7a..c22780188 100644
--- a/src/fx/fx.dhgr.48boxes.snake.a
+++ b/src/fx/fx.dhgr.48boxes.snake.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !Byte $D1,$D2,$D3,$D4,$D5,$D6,$D7,$D8
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.snake.clear.a b/src/fx/fx.dhgr.48boxes.snake.clear.a
index f89925ace..dca7b60df 100644
--- a/src/fx/fx.dhgr.48boxes.snake.clear.a
+++ b/src/fx/fx.dhgr.48boxes.snake.clear.a
@@ -15,39 +15,39 @@
          !Byte $D1,$D2,$D3,$D4,$D5,$D6,$D7,$D8
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte clear0F
-         !byte clear0E
-         !byte clear0D
-         !byte clear0C
-         !byte clear0B
-         !byte clear0A
-         !byte clear09
-         !byte clear08
-         !byte clear07
-         !byte clear06
-         !byte clear05
-         !byte clear04
-         !byte clear03
-         !byte clear02
-         !byte clear01
-         !byte clear00
+         !byte dhgr_clear0F
+         !byte dhgr_clear0E
+         !byte dhgr_clear0D
+         !byte dhgr_clear0C
+         !byte dhgr_clear0B
+         !byte dhgr_clear0A
+         !byte dhgr_clear09
+         !byte dhgr_clear08
+         !byte dhgr_clear07
+         !byte dhgr_clear06
+         !byte dhgr_clear05
+         !byte dhgr_clear04
+         !byte dhgr_clear03
+         !byte dhgr_clear02
+         !byte dhgr_clear01
+         !byte dhgr_clear00
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.spiral.a b/src/fx/fx.dhgr.48boxes.spiral.a
index 80d75e352..cdac3b736 100644
--- a/src/fx/fx.dhgr.48boxes.spiral.a
+++ b/src/fx/fx.dhgr.48boxes.spiral.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $FB,$FA,$F9,$F8,$F7,$F6,$F5,$F4
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.spiral.clear.a b/src/fx/fx.dhgr.48boxes.spiral.clear.a
index b265fed73..37fc13ec6 100644
--- a/src/fx/fx.dhgr.48boxes.spiral.clear.a
+++ b/src/fx/fx.dhgr.48boxes.spiral.clear.a
@@ -15,42 +15,42 @@
          !Byte $D8,$DC,$DE,$E0,$E2,$E4,$E6,$E8
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte clear00
-         !byte clear01
-         !byte clear02
-         !byte clear03
-         !byte clear04
-         !byte clear05
-         !byte clear06
-         !byte clear07
-         !byte clear08
-         !byte clear09
-         !byte clear0A
-         !byte clear0B
-         !byte clear0C
-         !byte clear0D
-         !byte clear0E
-         !byte clear0F
+         !byte dhgr_clear00
+         !byte dhgr_clear01
+         !byte dhgr_clear02
+         !byte dhgr_clear03
+         !byte dhgr_clear04
+         !byte dhgr_clear05
+         !byte dhgr_clear06
+         !byte dhgr_clear07
+         !byte dhgr_clear08
+         !byte dhgr_clear09
+         !byte dhgr_clear0A
+         !byte dhgr_clear0B
+         !byte dhgr_clear0C
+         !byte dhgr_clear0D
+         !byte dhgr_clear0E
+         !byte dhgr_clear0F
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
          !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.sync.a b/src/fx/fx.dhgr.48boxes.sync.a
index 75f4e11bf..143f4a038 100644
--- a/src/fx/fx.dhgr.48boxes.sync.a
+++ b/src/fx/fx.dhgr.48boxes.sync.a
@@ -17,20 +17,20 @@ USES_CLEAR = 0
          !byte $FF,$00,$FF,$00,$FF,$00,$FF,$00
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte copy0F
-         !byte copy0E
-         !byte copy0D
-         !byte copy0C
-         !byte copy0B
-         !byte copy0A
-         !byte copy09
-         !byte copy08
-         !byte copy07
-         !byte copy06
-         !byte copy05
-         !byte copy04
-         !byte copy03
-         !byte copy02
-         !byte copy01
-         !byte copy00
+         !byte dhgr_copy0F
+         !byte dhgr_copy0E
+         !byte dhgr_copy0D
+         !byte dhgr_copy0C
+         !byte dhgr_copy0B
+         !byte dhgr_copy0A
+         !byte dhgr_copy09
+         !byte dhgr_copy08
+         !byte dhgr_copy07
+         !byte dhgr_copy06
+         !byte dhgr_copy05
+         !byte dhgr_copy04
+         !byte dhgr_copy03
+         !byte dhgr_copy02
+         !byte dhgr_copy01
+         !byte dhgr_copy00
 EndStagesHi
diff --git a/src/fx/fx.dhgr.48boxes.sync.clear.a b/src/fx/fx.dhgr.48boxes.sync.clear.a
index 4ecb098f2..4e9f45af5 100644
--- a/src/fx/fx.dhgr.48boxes.sync.clear.a
+++ b/src/fx/fx.dhgr.48boxes.sync.clear.a
@@ -15,36 +15,36 @@
          !byte $FF,$00,$FF,$00,$FF,$00,$FF,$00
 
 StagesHi ; high bytes of address of drawing routine for each stage
-         !byte clear0F
-         !byte clear0E
-         !byte clear0D
-         !byte clear0C
-         !byte clear0B
-         !byte clear0A
-         !byte clear09
-         !byte clear08
-         !byte clear07
-         !byte clear06
-         !byte clear05
-         !byte clear04
-         !byte clear03
-         !byte clear02
-         !byte clear01
-         !byte clear00
-         !byte copy00
-         !byte copy01
-         !byte copy02
-         !byte copy03
-         !byte copy04
-         !byte copy05
-         !byte copy06
-         !byte copy07
-         !byte copy08
-         !byte copy09
-         !byte copy0A
-         !byte copy0B
-         !byte copy0C
-         !byte copy0D
-         !byte copy0E
-         !byte copy0F
+         !byte dhgr_clear0F
+         !byte dhgr_clear0E
+         !byte dhgr_clear0D
+         !byte dhgr_clear0C
+         !byte dhgr_clear0B
+         !byte dhgr_clear0A
+         !byte dhgr_clear09
+         !byte dhgr_clear08
+         !byte dhgr_clear07
+         !byte dhgr_clear06
+         !byte dhgr_clear05
+         !byte dhgr_clear04
+         !byte dhgr_clear03
+         !byte dhgr_clear02
+         !byte dhgr_clear01
+         !byte dhgr_clear00
+         !byte dhgr_copy00
+         !byte dhgr_copy01
+         !byte dhgr_copy02
+         !byte dhgr_copy03
+         !byte dhgr_copy04
+         !byte dhgr_copy05
+         !byte dhgr_copy06
+         !byte dhgr_copy07
+         !byte dhgr_copy08
+         !byte dhgr_copy09
+         !byte dhgr_copy0A
+         !byte dhgr_copy0B
+         !byte dhgr_copy0C
+         !byte dhgr_copy0D
+         !byte dhgr_copy0E
+         !byte dhgr_copy0F
 EndStagesHi
diff --git a/src/fx/fx.dhgr.dither.radial2.a b/src/fx/fx.dhgr.dither.radial2.a
index e3372e82b..f1b5fb4e5 100644
--- a/src/fx/fx.dhgr.dither.radial2.a
+++ b/src/fx/fx.dhgr.dither.radial2.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.dhgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit
 
 Start
-         !source "src/fx/fx.dhgr.dither.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "DHGRDITHRAD"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.dhgr.dither.radial4.a b/src/fx/fx.dhgr.dither.radial4.a
index ca448da4c..c98695d41 100644
--- a/src/fx/fx.dhgr.dither.radial4.a
+++ b/src/fx/fx.dhgr.dither.radial4.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.dhgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit2
 
 Start
-         !source "src/fx/fx.dhgr.dither.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "DHGRDITHRAD"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.dhgr.radial2.a b/src/fx/fx.dhgr.radial2.a
index 236f34fc4..fed0f9bdf 100644
--- a/src/fx/fx.dhgr.radial2.a
+++ b/src/fx/fx.dhgr.radial2.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.dhgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit
 
 Start
-         !source "src/fx/fx.dhgr.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "DHGRRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.dhgr.radial4.a b/src/fx/fx.dhgr.radial4.a
index 68de79ec9..7b31333e8 100644
--- a/src/fx/fx.dhgr.radial4.a
+++ b/src/fx/fx.dhgr.radial4.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.dhgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit2
 
 Start
-         !source "src/fx/fx.dhgr.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "DHGRRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.dhgr.radial5.a b/src/fx/fx.dhgr.radial5.a
index cb56eaf5b..bdec890e5 100644
--- a/src/fx/fx.dhgr.radial5.a
+++ b/src/fx/fx.dhgr.radial5.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.dhgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit3
 
 Start
-         !source "src/fx/fx.dhgr.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "DHGRRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.hgr.48boxes.a b/src/fx/fx.hgr.48boxes.a
index 74ca42e53..b712c50dc 100644
--- a/src/fx/fx.hgr.48boxes.a
+++ b/src/fx/fx.hgr.48boxes.a
@@ -7,6 +7,7 @@
 
          !source "src/fx/fx.hgr.48boxes.common.a"
 
+BoxInitialStages
          !byte $EC,$E8,$E4,$E0,$DC,$D8,$D4,$D0
          !byte $F0,$EC,$E8,$E4,$E0,$DC,$D8,$D4
          !byte $F4,$F0,$EC,$E8,$E4,$E0,$DC,$D8
diff --git a/src/fx/fx.hgr.48boxes.common.a b/src/fx/fx.hgr.48boxes.common.a
index 614d59acb..f1074c575 100644
--- a/src/fx/fx.hgr.48boxes.common.a
+++ b/src/fx/fx.hgr.48boxes.common.a
@@ -2,558 +2,42 @@
 ;(c) 2020 by 4am & qkumba
 ;
 
-; The screen is separated into 48 boxes.
-; Boxes are laid out in a grid, left-to-right, top-down:
-;
-; 0  1  2  3  4  5  6  7
-; 8  9  10 11 12 13 14 15
-; 16 17 18 19 20 21 22 23
-; 24 25 26 27 28 29 30 31
-; 32 33 34 35 36 37 38 39
-; 40 41 42 43 44 45 46 47
-;
-; Each box is 35x32 pixels, so each row of each box is 5 consecutive
-; bytes in memory once you calculate the HGR base address for that row.
-;
-; |BoxInitialStages| defines the initial grid of stages for each box.
-; Each stage is used as an index into the |StagesHi| array
-; to find the drawing routine for that stage (if any).
-; Each box's stage is incremented after each iteration through the main loop.
-; When the main loop iterates through all 48 boxes without drawing anything,
-; the program exits.
-;
-; There are 16 clear routines that set certain bits to 0 (black),
-; labeled clear00..clear0F. clear00 clears the inner-most box, and
-; clear0F clears the outermost box (see diagram).
-; There are 16 copy routines that copy certain bits from the source
-; image on page 2 to the destination image on page 1, labeled copy00..copy0F.
-;
-; row|                 bits
-; ---+---------------------------------------
-; 00 |FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF
-; 01 |FEEEEEE|EEEEEEE|EEEEEEE|EEEEEEE|EEEEEEF
-; 02 |FEDDDDD|DDDDDDD|DDDDDDD|DDDDDDD|DDDDDEF
-; 03 |FEDCCCC|CCCCCCC|CCCCCCC|CCCCCCC|CCCCDEF
-; 04 |FEDCBBB|BBBBBBB|BBBBBBB|BBBBBBB|BBBCDEF
-; 05 |FEDCBAA|AAAAAAA|AAAAAAA|AAAAAAA|AABCDEF
-; 06 |FEDCBA9|9999999|9999999|9999999|9ABCDEF
-; 07 |FEDCBA9|8888888|8888888|8888888|9ABCDEF
-; ---+-------+-------+-------+-------+-------
-; 08 |FEDCBA9|8777777|7777777|7777778|9ABCDEF
-; 09 |FEDCBA9|8766666|6666666|6666678|9ABCDEF
-; 0A |FEDCBA9|8765555|5555555|5555678|9ABCDEF
-; 0B |FEDCBA9|8765444|4444444|4445678|9ABCDEF
-; 0C |FEDCBA9|8765433|3333333|3345678|9ABCDEF
-; 0D |FEDCBA9|8765432|2222222|2345678|9ABCDEF
-; 0E |FEDCBA9|8765432|1111111|2345678|9ABCDEF
-; 0F |FEDCBA9|8765432|1000001|2345678|9ABCDEF
-; ---+-------+-------+-------+-------+-------
-; 10 |FEDCBA9|8765432|1000001|2345678|9ABCDEF
-; 11 |FEDCBA9|8765432|1111111|2345678|9ABCDEF
-; 12 |FEDCBA9|8765432|2222222|2345678|9ABCDEF
-; 13 |FEDCBA9|8765433|3333333|3345678|9ABCDEF
-; 14 |FEDCBA9|8765444|4444444|4445678|9ABCDEF
-; 15 |FEDCBA9|8765555|5555555|5555678|9ABCDEF
-; 16 |FEDCBA9|8766666|6666666|6666678|9ABCDEF
-; 17 |FEDCBA9|8777777|7777777|7777778|9ABCDEF
-; ---+-------+-------+-------+-------+-------
-; 18 |FEDCBA9|8888888|8888888|8888888|9ABCDEF
-; 19 |FEDCBA9|9999999|9999999|9999999|9ABCDEF
-; 1A |FEDCBAA|AAAAAAA|AAAAAAA|AAAAAAA|AABCDEF
-; 1B |FEDCBBB|BBBBBBB|BBBBBBB|BBBBBBB|BBBCDEF
-; 1C |FEDCCCC|CCCCCCC|CCCCCCC|CCCCCCC|CCCCDEF
-; 1D |FEDDDDD|DDDDDDD|DDDDDDD|DDDDDDD|DDDDDEF
-; 1E |FEEEEEE|EEEEEEE|EEEEEEE|EEEEEEE|EEEEEEF
-; 1F |FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF|FFFFFFF
-;
-
-!ifndef USES_CLEAR {
-  ; if an effect doesn't use any clear stages, you can reduce code size
-  ; by setting USES_CLEAR=0 before including this file
-  USES_CLEAR = 1
-}
-
-src      = $00                       ; [word][must be at $00] used by drawing routines
-dst      = $02                       ; [word] used by drawing routines
-rowcount = $04                       ; [byte] used by drawing routines
-;hgrlo    = $201                      ; [$C0 bytes] HGR base addresses (defined in constants.a)
-;hgrhi    = $301                      ; [$C0 bytes] HGR base addresses (defined in constants.a)
-BoxesX   = $90                       ; [$30 bytes] starting row for each box
-BoxesY   = $C0                       ; [$30 bytes] starting byte offset for each box
-
-; High bytes of drawing routines for each stage (actual routines will be page-aligned).
-; To minimize code size, we build drawing routines in this order:
-; - copy01 (STAGE1 template)
-; - copy00 (STAGE0 template)
-; - copy0F..copy09 (OUTER_STAGE template)
-; - copy08..copy02 (MIDDLE_STAGE template)
-; - change some opcodes to turn the 'copy' routines into 'clear' routines
-; - clear0F..clear08 (OUTER_STAGE)
-; - clear07..clear02 (MIDDLE_STAGE)
-; - clear01 (STAGE1)
-; - clear00 (STAGE0)
-clear00  = $80
-clear01  = $81
-clear02  = $82
-clear03  = $83
-clear04  = $84
-clear05  = $85
-clear06  = $86
-clear07  = $87
-clear08  = $88
-clear09  = $89
-clear0A  = $8A
-clear0B  = $8B
-clear0C  = $8C
-clear0D  = $8D
-clear0E  = $8E
-clear0F  = $8F
-copy02   = $90
-copy03   = $91
-copy04   = $92
-copy05   = $93
-copy06   = $94
-copy07   = $95
-copy08   = $96
-copy09   = $97
-copy0A   = $98
-copy0B   = $99
-copy0C   = $9A
-copy0D   = $9B
-copy0E   = $9C
-copy0F   = $9D
-copy00   = $9E
-copy01   = $9F
-
-; tokens for code generation
-; used as indexes into |codegen_pieces| and |codegen_piece_lengths|,
-; so keep all three in sync
-k_rts                     = 0        ; must be 0
-k_inx_and_recalc          = 1
-k_recalc                  = 2
-k_recalc_and_iny          = 3
-k_stage_init              = 4
-k_maskcopy_pre            = 5
-k_maskcopy_post_and_iny   = 6
-k_maskcopy_post           = 7
-k_copy_and_iny            = 8
-k_copy                    = 9
-k_dey2                    = 10
-k_iny2                    = 11
-k_middle_branches         = 12
-k_outer_branches          = 13
-k_edge_left_mask          = 14
-k_edge_right_mask         = 15
-k_left_mask               = 16
-k_right_mask              = 17
-
          !source "src/fx/macros.a"
 
-; actual code starts here
+InitOnce
+         bit   .Start
+         ldx   #$4C
+         stx   InitOnce
+         +LDADDR .FXCodeFile
+         ldx   #>FXCode
+         jsr   iLoadFXCODE
 
-         ; drawing routines for each stage are constructed dynamically
-         ; and stored at copy00..copy0F and clear00..clear0F
-         jsr   BuildDrawingRoutines
-
-         ; set up zero page for drawing phase
-         ; A=0 here
-         tax
--        ldy   start-5, x
-         sty   $00, x
-         sta   EndStagesHi, x
-         inx
-         bne   -
-
-         jsr   iBuildHGRTables
-
-; Generate |BoxesX| and |BoxesY| arrays
-; BoxesX (starting row for each box)
-;  $00,$00,$00,$00,$00,$00,$00,$00
-;  $20,$20,$20,$20,$20,$20,$20,$20
-;  $40,$40,$40,$40,$40,$40,$40,$40
-;  $60,$60,$60,$60,$60,$60,$60,$60
-;  $80,$80,$80,$80,$80,$80,$80,$80
-;  $A0,$A0,$A0,$A0,$A0,$A0,$A0,$A0
-; BoxesY (starting byte offset for each box)
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-;  $00,$05,$0A,$0F,$14,$19,$1E,$23
-         ldx   #48
-         ldy   #$A0
-         lda   #$23
-         pha
--        tya
-         sta   BoxesX-1, x
-         pla
-         sta   BoxesY-1, x
-         sec
-         sbc   #5
-         bcs   +
-         lda   #$23
-+        pha
-         dex
-         txa
-         and   #7
-         bne   -
-         tya
-         sec
-         sbc   #$20
-         tay
-         txa
-         bne   -
-         pla
-
-         jmp   MainLoop
-
-; These are all the pieces of code we need to construct the drawing routines.
-; There are 32 drawing routines (16 if USES_CLEAR=0), which we construct from
-; four templates (below). Templates use tokens to refer to these code pieces.
-; Note that several pieces overlap in order to minimize code size.
-; Everything from CODEGEN_COPY_START and onward is copied to zero page for
-; the code generation phase on program startup.
-CODEGEN_COPY_START
-!pseudopc 0 {
-RTS0                                 ; 1 byte
-         rts
-RTS0_E
-INX_AND_RECALC                       ; 16 bytes
-         inx
-RECALC_AND_INY                       ; 16 bytes
-RECALC                               ; 15 bytes
-         lda   hgrlo, x
-         sta   <src
-         sta   <dst
-         lda   hgrhi, x
-         sta   <dst+1
-         eor   #$60
-         sta   <src+1
-RECALC_E
-INX_AND_RECALC_E
-         iny
-RECALC_AND_INY_E
-STAGE_INIT                           ; 8 bytes
-ROW_COUNT=*+1
-         ldx   #$1F                  ; SMC
-         stx   <rowcount
-FIRST_ROW=*+1
-         adc   #$0E                  ; SMC
-         tax
-STAGE_INIT_E
-MASKCOPY_PRE                         ; 5 bytes
-         lda   (dst), y
-BIT_FOR_CLEAR
-         eor   (src), y
-         !byte $29                   ; (AND #$44 opcode)
-MASKCOPY_PRE_E
-MASKCOPY_POST_AND_INY                ; 5 bytes
-MASKCOPY_POST                        ; 4 bytes
-         eor   (dst), y
-         sta   (dst), y
-MASKCOPY_POST_E
-         iny
-MASKCOPY_POST_AND_INY_E
-COPY_AND_INY                         ; 5 bytes
-COPY                                 ; 4 bytes
-         lda   (src), y
-         sta   (dst), y
-COPY_E
-INY2                                 ; 2 bytes
-         iny
-COPY_AND_INY_E
-         iny
-INY2_E
-DEY2                                 ; 2 bytes
-         dey
-         dey
-DEY2_E
-MIDDLE_BRANCHES                      ; 6 bytes
-         dec   <rowcount
-         ; these monsters avoid hard-coded branching
-         ; trailing -2 for dec rowcount, -2 for branch itself
-         !byte $F0,MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_LEFT_MASK-EDGE_LEFT_MASK_E+MASKCOPY_POST_AND_INY-MASKCOPY_POST_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_RIGHT_MASK-EDGE_RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2
-         ; another -2 for the previous branch as well
-         !byte $10,MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2-2
-MIDDLE_BRANCHES_E
-OUTER_BRANCHES                       ; 6 bytes
-         dec   <rowcount
-         ; these monsters avoid hard-coded branching
-         ; trailing -2 for dec rowcount, -2 for branch itself
-         !byte $F0,MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_LEFT_MASK-EDGE_LEFT_MASK_E+MASKCOPY_POST_AND_INY-MASKCOPY_POST_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+COPY_AND_INY-COPY_AND_INY_E+MASKCOPY_PRE-MASKCOPY_PRE_E+EDGE_RIGHT_MASK-EDGE_RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2
-         ; another -2 for the previous branch as well
-         !byte $10,MASKCOPY_PRE-MASKCOPY_PRE_E+LEFT_MASK-LEFT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+INY2-INY2_E+INY2-INY2_E+MASKCOPY_PRE-MASKCOPY_PRE_E+RIGHT_MASK-RIGHT_MASK_E+MASKCOPY_POST-MASKCOPY_POST_E+DEY2-DEY2_E+DEY2-DEY2_E+INX_AND_RECALC-INX_AND_RECALC_E-2-2-2
-OUTER_BRANCHES_E
-EDGE_LEFT_MASK   = $FC
-EDGE_LEFT_MASK_E = $FD
-EDGE_RIGHT_MASK  = $FD
-EDGE_RIGHT_MASK_E = $FE
-LEFT_MASK         = $FE
-LEFT_MASK_E       = $FF
-RIGHT_MASK        = $FF
-RIGHT_MASK_E      = $100
-
-codegen_piece_lengths                ; length of each of the pieces
-         !byte RTS0_E-RTS0
-         !byte INX_AND_RECALC_E-INX_AND_RECALC
-         !byte RECALC_E-RECALC
-         !byte RECALC_AND_INY_E-RECALC_AND_INY
-         !byte STAGE_INIT_E-STAGE_INIT
-         !byte MASKCOPY_PRE_E-MASKCOPY_PRE
-         !byte MASKCOPY_POST_AND_INY_E-MASKCOPY_POST_AND_INY
-         !byte MASKCOPY_POST_E-MASKCOPY_POST
-         !byte COPY_AND_INY_E-COPY_AND_INY
-         !byte COPY_E-COPY
-         !byte DEY2_E-DEY2
-         !byte INY2_E-INY2
-         !byte MIDDLE_BRANCHES_E-MIDDLE_BRANCHES
-         !byte OUTER_BRANCHES_E-OUTER_BRANCHES
-         !byte EDGE_LEFT_MASK_E-EDGE_LEFT_MASK
-         !byte EDGE_RIGHT_MASK_E-EDGE_RIGHT_MASK
-         !byte LEFT_MASK_E-LEFT_MASK
-         !byte RIGHT_MASK_E-RIGHT_MASK
-
-codegen_pieces                       ; address of each of the pieces (on zero page, so 1 byte)
-         !byte <RTS0
-         !byte <INX_AND_RECALC
-         !byte <RECALC
-         !byte <RECALC_AND_INY
-         !byte <STAGE_INIT
-         !byte <MASKCOPY_PRE
-         !byte <MASKCOPY_POST_AND_INY
-         !byte <MASKCOPY_POST
-         !byte <COPY_AND_INY
-         !byte <COPY
-         !byte <DEY2
-         !byte <INY2
-         !byte <MIDDLE_BRANCHES
-         !byte <OUTER_BRANCHES
-         !byte <EDGE_LEFT_MASK
-         !byte <EDGE_RIGHT_MASK
-         !byte <LEFT_MASK
-         !byte <RIGHT_MASK
-
-; Template for 'stage 0' routine (copy00), which copies the innermost
-; part of the box (labeled '0' in diagram above).
-STAGE0
-         !byte k_stage_init
-         !byte k_recalc
-         !byte k_iny2
-         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
-         !byte k_inx_and_recalc
-         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
-         !byte k_rts                 ; also serves as an end-of-template marker
-
-; Template for 'stage 1' routine (copy01), which copies the pixels
-; around the innermost box (labeled '1' in diagram above).
-STAGE1
-         !byte k_stage_init
-         !byte k_recalc
-         !byte k_iny2
-         !byte k_copy
-         !byte k_inx_and_recalc
-         !byte k_copy
-         !byte k_inx_and_recalc
-         !byte k_copy
-         !byte k_inx_and_recalc
-         !byte k_copy
-         !byte k_rts                 ; also serves as an end-of-template marker
-
-; Template for stages 2-8 (copy02..copy08)
-MIDDLE_STAGE
-         !byte k_stage_init
-         !byte k_recalc_and_iny
-         !byte k_maskcopy_pre, k_edge_left_mask, k_maskcopy_post_and_iny
-         !byte k_copy_and_iny
-         !byte k_maskcopy_pre, k_edge_right_mask, k_maskcopy_post
-         !byte k_dey2
-         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
-         !byte k_iny2
-         !byte k_maskcopy_pre, k_right_mask, k_maskcopy_post
-         !byte k_dey2
-         !byte k_inx_and_recalc
-         !byte k_middle_branches
-         !byte k_rts                 ; also serves as an end-of-template marker
-
-; Template for stages 9-15 (copy09..copy0F)
-OUTER_STAGE
-         !byte k_stage_init
-         !byte k_recalc
-         !byte k_maskcopy_pre, k_edge_left_mask, k_maskcopy_post_and_iny
-         !byte k_copy_and_iny
-         !byte k_copy_and_iny
-         !byte k_copy_and_iny
-         !byte k_maskcopy_pre, k_edge_right_mask, k_maskcopy_post
-         !byte k_dey2
-         !byte k_dey2
-         !byte k_maskcopy_pre, k_left_mask, k_maskcopy_post
-         !byte k_iny2
-         !byte k_iny2
-         !byte k_maskcopy_pre, k_right_mask, k_maskcopy_post
-         !byte k_dey2
-         !byte k_dey2
-         !byte k_inx_and_recalc
-         !byte k_outer_branches
-         !byte k_rts                 ; also serves as an end-of-template marker
-
-EdgeRightMasks
-         !byte %10000001
-         !byte %10000011
-         !byte %10000111
-         !byte %10001111
-         !byte %10011111
-         !byte %10111111
-         !byte %11111111
-LeftMasks
-         !byte %11000000
-         !byte %10100000
-         !byte %10010000
-         !byte %10001000
-         !byte %10000100
-         !byte %10000010
-RightMasks
-         !byte %10000001             ; also the last item in LeftMasks
-         !byte %10000010
-         !byte %10000100
-         !byte %10001000
-         !byte %10010000
-         !byte %10100000
-EdgeLeftMasks
-         !byte %11000000             ; also the last item in RightMasks
-         !byte %11100000
-         !byte %11110000
-         !byte %11111000
-         !byte %11111100
-         !byte %11111110
-         !byte %11111111
-
-codegen_stage
-         !byte 27
-codegen_maskindex
-         !byte 0
-
-BuildDrawingRoutineFrom
-         sta   <codegen_token_src
-BuildDrawingRoutine
-         ldy   #0
-         sty   <codegen_token_x
-BuildTokenLoop
-codegen_token_x=*+1
-         ldx   #$00
-codegen_token_src=*+1
-         lda   <OUTER_STAGE, x
-         inc   <codegen_token_x
-         pha
-         tax
-         lda   <codegen_piece_lengths, x
-         sta   <piece_length
-         lda   <codegen_pieces, x
-         sta   <piece_src
+         ; initialize and copy stage drawing routines table into place
          ldx   #0
-BuildPieceLoop
-piece_src=*+1
-         lda   $FD, x                ; SMC
-         !byte $99,$00               ; STA $4400, Y
-codegen_dst
-         !byte copy01                ; SMC
-         iny
-         inx
-piece_length=*+1
-         cpx   #$FD                  ; SMC
-         bcc   BuildPieceLoop
-         pla
-         bne   BuildTokenLoop
-         dec   <codegen_dst
-         inc   <FIRST_ROW
-         rts
-}
-
-BuildDrawingRoutines
-         ; copy codegen data to zero page
-         ldx   #0
--        lda   CODEGEN_COPY_START, x
-         sta   $00, x
+         txa
+-        sta   EndStagesHi, x
          inx
          bne   -
+-        lda   StagesHi, x
+         sta   StageDrawingRoutines, x
+         inx
+         bne   -
+         beq   .Start                ; always branches
 
-         ; generate drawing routines for copy01, then copy00
-         jsr   BuildStage1And0
-         ; A=0 here
-         sta   <FIRST_ROW
+.FXCodeFile
+         +PSTRING "HGR48"
 
-         ; generate drawing routines for copy0F..copy02, then clear0F..clear02
-         lda   #<MIDDLE_STAGE
----      eor   #(<OUTER_STAGE XOR <MIDDLE_STAGE)
-         sta   <codegen_token_src
-         ldx   #6
---       stx   <codegen_maskindex
-         lda   <EdgeLeftMasks, x
-         sta   <EDGE_LEFT_MASK
-         lda   <EdgeRightMasks, x
-         sta   <EDGE_RIGHT_MASK
-         lda   <LeftMasks, x
-         sta   <LEFT_MASK
-         lda   <RightMasks, x
-         sta   <RIGHT_MASK
-         jsr   BuildDrawingRoutine
-         dec   <ROW_COUNT
-         dec   <ROW_COUNT
-         dec   <codegen_stage
-         bmi   BuildStage1And0
-         lda   <codegen_stage
-         eor   #13
-         bne   +
-!if USES_CLEAR {
-         ; reset counts and switch from copy to clear
-         sta   <FIRST_ROW
-         lda   #$1F
-         sta   <ROW_COUNT
-         lda   #$A9
-         sta   <COPY
-         lda   #$24
-         sta   <BIT_FOR_CLEAR
-} else {
-         rts
-}
-+        lda   <codegen_token_src
-         ldx   <codegen_maskindex
+.Start
+         jsr   FXCode                ; inititalize drawing routines and tables
+
+         ; copy this effect's initial stages to zp
+         ldx   #47
+-        ldy   BoxInitialStages, x
+         sty   $2D, x                ; must match BoxStages address in code.hgr.48boxes.a
          dex
-         bmi   ---
-         bpl   --                    ; always branches
+         bpl   -
 
-         ; generate drawing routines for copy01, copy00 (or clear01, clear00)
-BuildStage1And0
-         lda   #%10111110
-         sta   <LEFT_MASK
-         lda   #<STAGE1
-         jsr   BuildDrawingRoutineFrom
-         lda   #<STAGE0
-         jmp   BuildDrawingRoutineFrom
-
-start
-!pseudopc 5 {
-MainLoop ldx   #47
-BoxLoop  ldy   <BoxStages, x         ; for each box, get its current stage
-         inc   <BoxStages, x         ; increment every box's stage every time through the loop
-         lda   StagesHi, y
-         beq   <NextBox              ; if stage's drawing routine is 0, nothing to do
-         sta   <j+2
-         lda   <BoxesX, x            ; A = starting HGR row for this box
-         ldy   <BoxesY, x            ; Y = starting byte offset for this box
-         clc
-         stx   <ReBox+1
-j        jsr   $0000                 ; [SMC] call drawing routine for this stage
-ReBox    ldx   #$FD                  ; [SMC]
-NextBox  dex
-         bpl   <BoxLoop
-         lda   <j+2
-         bpl   +                     ; if we didn't draw anything in any box, we're done
-         lda   KBD
-         sta   <j+2
-         bpl   <MainLoop
-+        rts
-BoxStages
-}
+         ; exit via MainLoop
+         jmp   5                     ; must match MainLoop address in code.hgr.48boxes.a
 
 BoxInitialStages
diff --git a/src/fx/fx.hgr.dither.radial2.a b/src/fx/fx.hgr.dither.radial2.a
index d75a3fca3..81fe26580 100644
--- a/src/fx/fx.hgr.dither.radial2.a
+++ b/src/fx/fx.hgr.dither.radial2.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit
 
 Start
-         !source "src/fx/fx.hgr.dither.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "HGRDITHERRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.hgr.dither.radial4.a b/src/fx/fx.hgr.dither.radial4.a
index dceeb9fea..074269a5b 100644
--- a/src/fx/fx.hgr.dither.radial4.a
+++ b/src/fx/fx.hgr.dither.radial4.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit2
 
 Start
-         !source "src/fx/fx.hgr.dither.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "HGRDITHERRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/fx/fx.hgr.dither.radial5.a b/src/fx/fx.hgr.dither.radial5.a
index 3dce12d6c..47d9a440d 100644
--- a/src/fx/fx.hgr.dither.radial5.a
+++ b/src/fx/fx.hgr.dither.radial5.a
@@ -7,13 +7,13 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
+         +FX_INITONCE_1BIT FXCodeFile, CoordinatesFile, Start
          jsr   iRippleCoordinates1Bit3
 
 Start
-         !source "src/fx/fx.hgr.dither.radial.common.a"
+         jmp   FXCode
 
+FXCodeFile
+         +PSTRING "HGRDITHERRADIAL"
 CoordinatesFile
          +PSTRING "RADIAL.DATA"
-Coordinates=Coordinates1Bit
-EndCoordinates=EndCoordinates1Bit
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index c58f79d1e..11d53f843 100644
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15888521
+         !be24  15882495
          !le16     5130
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 93d5ae785..5604e3016 100644
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15832950
+         !be24  15826855
          !le16     5732
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 2e10e6ad9..a139ceac1 100644
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15764717
+         !be24  15758622
          !le16     4194
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index ab6875276..8d84ccc0f 100644
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15779431
+         !be24  15773336
          !le16     4652
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 810e03af5..e6a730efc 100644
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15798146
+         !be24  15792051
          !le16     5621
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 901731a19..e576f946a 100644
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15819187
+         !be24  15813092
          !le16     6199
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index 6f5b37a13..70fe495ca 100644
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15893651
+         !be24  15887625
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index 3def2edcc..750ffd000 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  15894405
+         !be24  15888379
          !le16      449
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 3efc5d06c..396a381c1 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  15894854
+         !be24  15888828
          !le16      303
diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a
index 2ad140626..f8fbe02d9 100644
--- a/src/index/demo.idx.a
+++ b/src/index/demo.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  12660935
+         !be24  12654840
          !le16     1652
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index ee700c64d..9e30ee14c 100644
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15841322
+         !be24  15835227
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index a34b988b2..922fbfdfb 100644
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15894137
+         !be24  15888111
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index 51561d753..11c63c1b9 100644
--- a/src/index/dgr.idx.a
+++ b/src/index/dgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15888462
+         !be24  15882436
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 5830a6537..988c37a1b 100644
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15886882
+         !be24  15880856
          !le16     1426
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index 0f9eac75c..f3c9d1b7a 100644
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15871648
+         !be24  15865622
          !le16      557
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index 5111844b5..969689277 100644
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15838682
+         !be24  15832587
          !le16     2640
diff --git a/src/index/fxcode.idx.a b/src/index/fxcode.idx.a
index 44b802c17..008b80c3d 100644
--- a/src/index/fxcode.idx.a
+++ b/src/index/fxcode.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15843320
-         !le16      164
+         !be24  15837225
+         !le16      233
diff --git a/src/index/fxdata.idx.a b/src/index/fxdata.idx.a
index f6d83a4ff..08904f1b2 100644
--- a/src/index/fxdata.idx.a
+++ b/src/index/fxdata.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15843484
+         !be24  15837458
          !le16      538
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index d6c16a057..1c718d9df 100644
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15844022
+         !be24  15837996
          !le16     7564
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index ba4e808b3..194e5dfec 100644
--- 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  15894061
+         !be24  15888035
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index f287eb3f1..3ea7356c6 100644
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15888308
+         !be24  15882282
          !le16      154
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index 7d8e33b4e..241c0497c 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  15894204
+         !be24  15888178
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index ee248ac0f..6f63dc52b 100644
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15872205
+         !be24  15866179
          !le16     4334
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index 5aa27d651..19cfab855 100644
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15876539
+         !be24  15870513
          !le16     1733
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index 3b11bda0e..8da169348 100644
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15878272
+         !be24  15872246
          !le16     1181
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index 20bcd1589..a3e1708a6 100644
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15879453
+         !be24  15873427
          !le16     3394
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 3371ecdd9..3214d069a 100644
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15882847
+         !be24  15876821
          !le16     3429
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index 660801ec0..8c7e7aeed 100644
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15886276
+         !be24  15880250
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index efdd9c4c5..4afe16017 100644
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15886755
+         !be24  15880729
          !le16      127
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 5485708b4..0cb14c7f7 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  15895157
+         !be24  15889131
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index a64f8b2b9..2909b4189 100644
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15856991
+         !be24  15850965
          !le16     5083
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 28c9272cf..a115e4b8e 100644
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15862074
+         !be24  15856048
          !le16     2485
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index f9769781e..833ab805a 100644
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15825386
+         !be24  15819291
          !le16     7564
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index f2a7130ed..b58e50c61 100644
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15755134
+         !be24  15749039
          !le16     9583
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 7144ec199..fe39ecbc0 100644
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15768911
+         !be24  15762816
          !le16    10520
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index bfc6a628c..a61194ea0 100644
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15784083
+         !be24  15777988
          !le16    14063
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index d60272b9a..a8c195d1f 100644
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15803767
+         !be24  15797672
          !le16    15420
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index d6da6425d..facba89f5 100644
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15842962
+         !be24  15836867
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index 5d557ac42..7b10acaf8 100644
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15851586
+         !be24  15845560
          !le16     5405
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index 08679f986..9cd8b161c 100644
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15864559
+         !be24  15858533
          !le16     7089
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index fcac4bfaa..768c62ad2 100644
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15750786
+         !be24  15744691
          !le16     4348