From 90a6f55ddfddda0dc26c0dfb93877c118dd9432f Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Tue, 28 May 2024 09:42:19 -0400
Subject: [PATCH] factor out more FX routines

---
 src/4cade.a                      |  1 +
 src/constants.a                  |  3 +-
 src/fx.lib.a                     | 79 ++++++++++++++++++++++++++++++++
 src/fx/fx.hgr.bubbles.a          |  4 +-
 src/fx/fx.hgr.bubbles.in.a       |  2 +-
 src/fx/fx.hgr.corner4.a          |  4 +-
 src/fx/fx.hgr.corner4.in.a       |  2 +-
 src/fx/fx.hgr.corner4.ripple.a   |  2 +-
 src/fx/fx.hgr.iris.a             |  4 +-
 src/fx/fx.hgr.iris.in.a          |  2 +-
 src/fx/fx.hgr.precomputed.1bit.a | 71 ----------------------------
 src/fx/fx.hgr.ripple.a           |  2 +-
 src/fx/fx.hgr.slow.star.a        |  4 +-
 src/fx/fx.hgr.slow.star.in.a     |  2 +-
 src/fx/fx.hgr.slow.star.ripple.a |  2 +-
 src/fx/fx.hgr.snowflake.a        |  4 +-
 src/fx/fx.hgr.snowflake.in.a     |  2 +-
 src/fx/fx.hgr.snowflake.ripple.a |  2 +-
 src/fx/fx.hgr.swirl.a            |  2 +-
 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/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 +-
 59 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/src/4cade.a b/src/4cade.a
index 3c8d36d36..80f99bfdb 100644
--- a/src/4cade.a
+++ b/src/4cade.a
@@ -161,6 +161,7 @@ gGlobalPrefsStore
          +DEFINE_INDIRECT_VECTOR iReverseCoordinates2Bit,  ReverseCoordinates2Bit
          +DEFINE_INDIRECT_VECTOR iBuildDHGRSparseBitmasks2Bit, BuildDHGRSparseBitmasks2Bit
          +DEFINE_INDIRECT_VECTOR iBuildHGRSparseBitmasks2Bit, BuildHGRSparseBitmasks2Bit
+         +DEFINE_INDIRECT_VECTOR iHGRPrecomputed1Bit,      HGRPrecomputed1Bit
          +DEFINE_INDIRECT_VECTOR iBuildDHGRSparseBitmasks1Bit, BuildDHGRSparseBitmasks1Bit
          +DEFINE_INDIRECT_VECTOR iBuildHGRSparseBitmasks1Bit, BuildHGRSparseBitmasks1Bit
          +DEFINE_INDIRECT_VECTOR iRippleCoordinates1Bit4,  RippleCoordinates1Bit4
diff --git a/src/constants.a b/src/constants.a
index 079f77c15..07716ccb4 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -192,7 +192,8 @@ iRippleCoordinates1Bit3   = iRippleCoordinates1Bit2-3
 iRippleCoordinates1Bit4   = iRippleCoordinates1Bit3-3
 iBuildHGRSparseBitmasks1Bit  = iRippleCoordinates1Bit4-3
 iBuildDHGRSparseBitmasks1Bit = iBuildHGRSparseBitmasks1Bit-3
-iBuildHGRSparseBitmasks2Bit  = iBuildDHGRSparseBitmasks1Bit-3
+iHGRPrecomputed1Bit       = iBuildDHGRSparseBitmasks1Bit-3
+iBuildHGRSparseBitmasks2Bit  = iHGRPrecomputed1Bit-3
 iBuildDHGRSparseBitmasks2Bit = iBuildHGRSparseBitmasks2Bit-3
 iReverseCoordinates2Bit   = iBuildDHGRSparseBitmasks2Bit-3
 iRippleCoordinates2Bit    = iReverseCoordinates2Bit-3
diff --git a/src/fx.lib.a b/src/fx.lib.a
index af70b8e7e..846a186e4 100644
--- a/src/fx.lib.a
+++ b/src/fx.lib.a
@@ -24,6 +24,7 @@
 ; - RippleCoordinates1Bit2
 ; - RippleCoordinates1Bit3
 ; - RippleCoordinates1Bit4
+; - HGRPrecomputed1Bit
 
 ; - BuildHGRSparseBitmasks2Bit
 ; - BuildDHGRSparseBitmasks2Bit
@@ -34,6 +35,12 @@
 ; - ReverseCoordinates3Bit
 ; - RippleCoordinates3Bit
 
+         !source "src/fx/macros.hgr.a"
+         !source "src/fx/macros.dhgr.a"
+         !source "src/fx/macros.shr.a"
+         !source "src/fx/macros.copybit.a"
+         !source "src/fx/macros.misc.a"
+
 WaitForKeyWithTimeout
 ; in:    A = timeout length (like standard $FCA8 wait routine)
 ; out:   A clobbered (not always 0 if key is pressed, but also not the key pressed)
@@ -415,6 +422,78 @@ aslmod   cmp   #$1A
 exit     rts
 }
 
+!zone {
+HGRPrecomputed1Bit
+         jsr   BuildHGRTables
+         jsr   BuildHGRMirrorTables
+         jsr   BuildHGRMirrorCols
+         jsr   BuildHGRSparseBitmasks1Bit
+         +COPY_TO_0 start, end
+         jmp   InputLoop
+start
+!pseudopc 0 {
+Exit1Bit rts
+InputLoop
+         ldy   #0
+input=*+1
+         ldx   Coordinates1Bit       ; first value: HGR row (only 0..95 will be in input array)
+         bmi   Exit1Bit              ; if > 127 then we're done
+         +ROW_X_TO_BASE_ADDRESSES
+         +ROW_X_TO_MIRROR_ADDRESSES
+
+         inc   input
+         lda   (input), y
+         +HIGH_3_LOW_5 input
+
+         ; main 1x2 block in top-left quadrant
+src1=*+1
+         lda   $FDFD, y
+         eor   (<dest1), y
+         and   copymasks1bit, x
+         eor   (<dest1), y
+dest1=*+1
+         sta   $FDFD, y
+src2=*+1
+         lda   $FDFD, y
+         eor   (<dest2), y
+         and   copymasks1bit, x
+         eor   (<dest2), y
+dest2=*+1
+         sta   $FDFD, y
+
+         ; corresponding 1x2 block in top-right quadrant (same row, opposite column)
+         lda   mirror_cols, y
+         tay
+         +COPY_BIT src1, dest1, mirror_copymasks1bit
+         +COPY_BIT src2, dest2, mirror_copymasks1bit
+
+         ; corresponding 1x2 block in bottom-right quadrant (opposite row, opposite column)
+mirror_src1=*+1
+         lda   $FDFD, y
+         eor   (<mirror_dest1), y
+         and   mirror_copymasks1bit, x
+         eor   (<mirror_dest1), y
+mirror_dest1=*+1
+         sta   $FDFD, y
+mirror_src2=*+1
+         lda   $FDFD, y
+         eor   (<mirror_dest2), y
+         and   mirror_copymasks1bit, x
+         eor   (<mirror_dest2), y
+mirror_dest2=*+1
+         sta   $FDFD, y
+
+         ; corresponding 1x2 block in bottom-left quadrant (opposite row, original column)
+         lda   mirror_cols, y
+         tay
+         +COPY_BIT mirror_src1, mirror_dest1, copymasks1bit
+         +COPY_BIT mirror_src2, mirror_dest2, copymasks1bit
+
+         +INC_INPUT_AND_LOOP InputLoop
+}
+end
+}
+
 BuildHGRSparseBitmasks2Bit
          lda   #%10000011
          sta   copymasks2bit
diff --git a/src/fx/fx.hgr.bubbles.a b/src/fx/fx.hgr.bubbles.a
index 2be8dc2a6..700d0005f 100644
--- a/src/fx/fx.hgr.bubbles.a
+++ b/src/fx/fx.hgr.bubbles.a
@@ -7,9 +7,7 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         +FX_INITONCE_1BIT CoordinatesFile, iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "BUBBLES.DATA"
diff --git a/src/fx/fx.hgr.bubbles.in.a b/src/fx/fx.hgr.bubbles.in.a
index 04c76e3e8..e3433b952 100644
--- a/src/fx/fx.hgr.bubbles.in.a
+++ b/src/fx/fx.hgr.bubbles.in.a
@@ -10,7 +10,7 @@
          +FX_INITONCE_1BIT CoordinatesFile, Start
          jsr   iReverseCoordinates1Bit
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "BUBBLES.DATA"
diff --git a/src/fx/fx.hgr.corner4.a b/src/fx/fx.hgr.corner4.a
index 50bed8ad4..6bc77c284 100644
--- a/src/fx/fx.hgr.corner4.a
+++ b/src/fx/fx.hgr.corner4.a
@@ -7,9 +7,7 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         +FX_INITONCE_1BIT CoordinatesFile, iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "CORNER4.DATA"
diff --git a/src/fx/fx.hgr.corner4.in.a b/src/fx/fx.hgr.corner4.in.a
index 45ca27abd..efd55849c 100644
--- a/src/fx/fx.hgr.corner4.in.a
+++ b/src/fx/fx.hgr.corner4.in.a
@@ -10,7 +10,7 @@
          +FX_INITONCE_1BIT CoordinatesFile, Start
          jsr   iReverseCoordinates1Bit
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "CORNER4.DATA"
diff --git a/src/fx/fx.hgr.corner4.ripple.a b/src/fx/fx.hgr.corner4.ripple.a
index 4355973ad..1004c6559 100644
--- a/src/fx/fx.hgr.corner4.ripple.a
+++ b/src/fx/fx.hgr.corner4.ripple.a
@@ -11,7 +11,7 @@
          jsr   iRippleCoordinates1Bit2
 
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "CORNER4.DATA"
diff --git a/src/fx/fx.hgr.iris.a b/src/fx/fx.hgr.iris.a
index 4e6fd4917..050128f38 100644
--- a/src/fx/fx.hgr.iris.a
+++ b/src/fx/fx.hgr.iris.a
@@ -7,9 +7,7 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         +FX_INITONCE_1BIT CoordinatesFile, iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "IRIS.DATA"
diff --git a/src/fx/fx.hgr.iris.in.a b/src/fx/fx.hgr.iris.in.a
index 8b83b49de..d5c92d929 100644
--- a/src/fx/fx.hgr.iris.in.a
+++ b/src/fx/fx.hgr.iris.in.a
@@ -10,7 +10,7 @@
          +FX_INITONCE_1BIT CoordinatesFile, Start
          jsr   iReverseCoordinates1Bit
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "IRIS.DATA"
diff --git a/src/fx/fx.hgr.precomputed.1bit.a b/src/fx/fx.hgr.precomputed.1bit.a
index da29f8972..3d467b8f4 100644
--- a/src/fx/fx.hgr.precomputed.1bit.a
+++ b/src/fx/fx.hgr.precomputed.1bit.a
@@ -38,77 +38,6 @@ InitOnce
          sta   EndCoordinates1Bit
 }
 
-!macro FX_PRECOMPUTED_1BIT .coords {
-         jsr   iBuildHGRTables
-         jsr   iBuildHGRMirrorTables
-         jsr   iBuildHGRMirrorCols
-         jsr   iBuildHGRSparseBitmasks1Bit
-         +COPY_TO_0 start, end
-         jmp   InputLoop
-start
-!pseudopc 0 {
-Exit1Bit rts
-InputLoop
-         ldy   #0
-input=*+1
-         ldx   .coords               ; first value: HGR row (only 0..95 will be in input array)
-         bmi   Exit1Bit              ; if > 127 then we're done
-         +ROW_X_TO_BASE_ADDRESSES
-         +ROW_X_TO_MIRROR_ADDRESSES
-
-         inc   input
-         lda   (input), y
-         +HIGH_3_LOW_5 input
-
-         ; main 1x2 block in top-left quadrant
-src1=*+1
-         lda   $FDFD, y
-         eor   (<dest1), y
-         and   copymasks1bit, x
-         eor   (<dest1), y
-dest1=*+1
-         sta   $FDFD, y
-src2=*+1
-         lda   $FDFD, y
-         eor   (<dest2), y
-         and   copymasks1bit, x
-         eor   (<dest2), y
-dest2=*+1
-         sta   $FDFD, y
-
-         ; corresponding 1x2 block in top-right quadrant (same row, opposite column)
-         lda   mirror_cols, y
-         tay
-         +COPY_BIT src1, dest1, mirror_copymasks1bit
-         +COPY_BIT src2, dest2, mirror_copymasks1bit
-
-         ; corresponding 1x2 block in bottom-right quadrant (opposite row, opposite column)
-mirror_src1=*+1
-         lda   $FDFD, y
-         eor   (<mirror_dest1), y
-         and   mirror_copymasks1bit, x
-         eor   (<mirror_dest1), y
-mirror_dest1=*+1
-         sta   $FDFD, y
-mirror_src2=*+1
-         lda   $FDFD, y
-         eor   (<mirror_dest2), y
-         and   mirror_copymasks1bit, x
-         eor   (<mirror_dest2), y
-mirror_dest2=*+1
-         sta   $FDFD, y
-
-         ; corresponding 1x2 block in bottom-left quadrant (opposite row, original column)
-         lda   mirror_cols, y
-         tay
-         +COPY_BIT mirror_src1, mirror_dest1, copymasks1bit
-         +COPY_BIT mirror_src2, mirror_dest2, copymasks1bit
-
-         +INC_INPUT_AND_LOOP InputLoop
-}
-end
-}
-
 !macro FX_PRECOMPUTED_1BIT_DITHER .coords, .endcoords {
          jsr   iBuildHGRDitherMasks
          jsr   iBuildHGRTables
diff --git a/src/fx/fx.hgr.ripple.a b/src/fx/fx.hgr.ripple.a
index b3de03782..2fb528a10 100644
--- a/src/fx/fx.hgr.ripple.a
+++ b/src/fx/fx.hgr.ripple.a
@@ -11,7 +11,7 @@
          jsr   iRippleCoordinates1Bit2
 
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "IRIS.DATA"
diff --git a/src/fx/fx.hgr.slow.star.a b/src/fx/fx.hgr.slow.star.a
index 112418b64..0f353f8b2 100644
--- a/src/fx/fx.hgr.slow.star.a
+++ b/src/fx/fx.hgr.slow.star.a
@@ -7,9 +7,7 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         +FX_INITONCE_1BIT CoordinatesFile, iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SLOW.STAR.DATA"
diff --git a/src/fx/fx.hgr.slow.star.in.a b/src/fx/fx.hgr.slow.star.in.a
index 259049134..2c9d0b4cf 100644
--- a/src/fx/fx.hgr.slow.star.in.a
+++ b/src/fx/fx.hgr.slow.star.in.a
@@ -10,7 +10,7 @@
          +FX_INITONCE_1BIT CoordinatesFile, Start
          jsr   iReverseCoordinates1Bit
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SLOW.STAR.DATA"
diff --git a/src/fx/fx.hgr.slow.star.ripple.a b/src/fx/fx.hgr.slow.star.ripple.a
index ce91d80ec..1aba6e040 100644
--- a/src/fx/fx.hgr.slow.star.ripple.a
+++ b/src/fx/fx.hgr.slow.star.ripple.a
@@ -11,7 +11,7 @@
          jsr   iRippleCoordinates1Bit2
 
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SLOW.STAR.DATA"
diff --git a/src/fx/fx.hgr.snowflake.a b/src/fx/fx.hgr.snowflake.a
index bdd8b8eb0..cd2e225f9 100644
--- a/src/fx/fx.hgr.snowflake.a
+++ b/src/fx/fx.hgr.snowflake.a
@@ -7,9 +7,7 @@
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         +FX_INITONCE_1BIT CoordinatesFile, iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SNOWFLAKE.DATA"
diff --git a/src/fx/fx.hgr.snowflake.in.a b/src/fx/fx.hgr.snowflake.in.a
index 18c7cc65a..8defc0709 100644
--- a/src/fx/fx.hgr.snowflake.in.a
+++ b/src/fx/fx.hgr.snowflake.in.a
@@ -10,7 +10,7 @@
          +FX_INITONCE_1BIT CoordinatesFile, Start
          jsr   iReverseCoordinates1Bit
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SNOWFLAKE.DATA"
diff --git a/src/fx/fx.hgr.snowflake.ripple.a b/src/fx/fx.hgr.snowflake.ripple.a
index 691fc095e..b994e63e2 100644
--- a/src/fx/fx.hgr.snowflake.ripple.a
+++ b/src/fx/fx.hgr.snowflake.ripple.a
@@ -11,7 +11,7 @@
          jsr   iRippleCoordinates1Bit2
 
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "SNOWFLAKE.DATA"
diff --git a/src/fx/fx.hgr.swirl.a b/src/fx/fx.hgr.swirl.a
index 7f374fc0d..9e210baac 100644
--- a/src/fx/fx.hgr.swirl.a
+++ b/src/fx/fx.hgr.swirl.a
@@ -11,7 +11,7 @@
          jsr   iRippleCoordinates1Bit4
 
 Start
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
+         jmp   iHGRPrecomputed1Bit
 
 CoordinatesFile
          +PSTRING "CORNER4.DATA"
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index 7822de8cf..d1fb82cb5 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  15909993
+         !be24  15906588
          !le16     5130
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 678ad61ec..92ee2fe70 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  15854673
+         !be24  15851268
          !le16     5732
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 572593ae5..00348913e 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  15786440
+         !be24  15783035
          !le16     4194
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index e89432574..95fe11570 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  15801154
+         !be24  15797749
          !le16     4652
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 237f2519e..e77c80047 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  15819869
+         !be24  15816464
          !le16     5621
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index ca504afe9..2efd44a08 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  15840910
+         !be24  15837505
          !le16     6199
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index af19f0fee..f57a16155 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  15915123
+         !be24  15911718
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index 7468251a9..842209880 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  15915877
+         !be24  15912472
          !le16      449
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index ae3e11ab9..7eee75692 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  15916326
+         !be24  15912921
          !le16      303
diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a
index ccbbdbd48..ca18c40bd 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  12682658
+         !be24  12679253
          !le16     1652
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index 66720b7bc..489e1e1b5 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  15863045
+         !be24  15859640
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 40483ffe3..829089c91 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  15915609
+         !be24  15912204
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index 4889adc22..e767baaac 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  15909934
+         !be24  15906529
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index ef95a9229..850bce4e6 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  15908354
+         !be24  15904949
          !le16     1426
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index fd445f92a..593289bf2 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  15893120
+         !be24  15889715
          !le16      557
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index 286499a17..b8812fd68 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  15860405
+         !be24  15857000
          !le16     2640
diff --git a/src/index/fxdata.idx.a b/src/index/fxdata.idx.a
index ba93c4dab..af58d2bcf 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  15865043
+         !be24  15861638
          !le16      451
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 7f66e2a35..beacbc0d9 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  15865494
+         !be24  15862089
          !le16     7564
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index 079b3d4ab..4acb3e806 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  15915533
+         !be24  15912128
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index a68d67316..b26763e03 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  15909780
+         !be24  15906375
          !le16      154
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index c2464d5ac..29d8e425b 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  15915676
+         !be24  15912271
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index 1211b5e5d..b32966f6a 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  15893677
+         !be24  15890272
          !le16     4334
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index ea92835b9..71a9487d3 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  15898011
+         !be24  15894606
          !le16     1733
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index 7c013a475..ccea981b6 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  15899744
+         !be24  15896339
          !le16     1181
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index f762082c3..cee8c2283 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  15900925
+         !be24  15897520
          !le16     3394
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 80db9b240..264703241 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  15904319
+         !be24  15900914
          !le16     3429
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index 0a58596cf..6ddc81cd3 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  15907748
+         !be24  15904343
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index f57fd294f..c8014699f 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  15908227
+         !be24  15904822
          !le16      127
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 9288f0831..63697dabe 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  15916629
+         !be24  15913224
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index 2ec5c1e21..e11fa4759 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  15878463
+         !be24  15875058
          !le16     5083
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 319036524..036bdd3ad 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  15883546
+         !be24  15880141
          !le16     2485
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index 4f40bdca1..557df7256 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  15847109
+         !be24  15843704
          !le16     7564
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index 34b8fa325..7d93a6f6d 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  15776857
+         !be24  15773452
          !le16     9583
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 5128c8d49..61c645548 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  15790634
+         !be24  15787229
          !le16    10520
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index fc62dba2b..09133034e 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  15805806
+         !be24  15802401
          !le16    14063
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index ecd5a9ee6..7aba8b84d 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  15825490
+         !be24  15822085
          !le16    15420
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index 8adf54229..ae926b362 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  15864685
+         !be24  15861280
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index 0870b8c41..a7bb64bce 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  15873058
+         !be24  15869653
          !le16     5405
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index a8d15f43e..6c8e00cf1 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  15886031
+         !be24  15882626
          !le16     7089
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index cc6ddc22c..71cac44bd 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  15772509
+         !be24  15769104
          !le16     4348