diff --git a/src/fx/fx.hgr.corner4.data.a b/src/fx/fx.hgr.corner4.data.a
index 01c9698ab..235334a2e 100644
--- a/src/fx/fx.hgr.corner4.data.a
+++ b/src/fx/fx.hgr.corner4.data.a
@@ -1,6 +1,6 @@
 !cpu 6502
 !to "build/FX/CORNER4.DATA",plain
-*=$8800
+*=$8600
          !byte $5F,%11010011
          !byte $5F,%10110011
          !byte $5F,%10010011
@@ -6722,3 +6722,7 @@
          !byte $01,%00000000
          !byte $01,%00100000
          !byte $80
+
+         !source "src/fx/fx.hgr.precomputed.1bit.a"
+         +FX_RIPPLE_1BIT aslmod2
+         rts
diff --git a/src/fx/fx.hgr.corner4.ripple.a b/src/fx/fx.hgr.corner4.ripple.a
index ee6c04df8..4a7ef9217 100644
--- a/src/fx/fx.hgr.corner4.ripple.a
+++ b/src/fx/fx.hgr.corner4.ripple.a
@@ -8,7 +8,7 @@
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
          +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod2
+         jsr EndCoordinates1Bit+1
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 
diff --git a/src/fx/fx.hgr.iris.data.a b/src/fx/fx.hgr.iris.data.a
index 7f6f29303..ce3da76f5 100644
--- a/src/fx/fx.hgr.iris.data.a
+++ b/src/fx/fx.hgr.iris.data.a
@@ -1,6 +1,6 @@
 !cpu 6502
 !to "build/FX/IRIS.DATA",plain
-*=$8800
+*=$8600
          !byte $5E,%10110011
          !byte $5E,%11010011
          !byte $5E,%10010011
@@ -6722,3 +6722,7 @@
          !byte $00,%00100000
          !byte $00,%00000000
          !byte $80
+
+         !source "src/fx/fx.hgr.precomputed.1bit.a"
+         +FX_RIPPLE_1BIT aslmod2
+         rts
diff --git a/src/fx/fx.hgr.precomputed.1bit.a b/src/fx/fx.hgr.precomputed.1bit.a
index 87785b770..68664c718 100644
--- a/src/fx/fx.hgr.precomputed.1bit.a
+++ b/src/fx/fx.hgr.precomputed.1bit.a
@@ -8,7 +8,7 @@ hgrlomirror    = $BD40    ; $C0 bytes
 mirror_cols    = $BE00    ; $28 bytes
 hgr1hi         = $BE40    ; $C0 bytes
 hgr1himirror   = $BF40    ; $C0 bytes
-Coordinates1Bit= $8800    ; $3481 bytes ($3480 on disk + 1 byte EOF marker)
+Coordinates1Bit= $8600    ; $3481 bytes ($3480 on disk + 1 byte EOF marker)
 EndCoordinates1Bit=Coordinates1Bit+$3480
 
          !source "src/fx/macros.a"
diff --git a/src/fx/fx.hgr.radial.data.a b/src/fx/fx.hgr.radial.data.a
index 0cee7c38c..0e9213b10 100644
--- a/src/fx/fx.hgr.radial.data.a
+++ b/src/fx/fx.hgr.radial.data.a
@@ -1,6 +1,6 @@
 !cpu 6502
 !to "build/FX/RADIAL.DATA",plain
-*=$8800
+*=$8600
          !byte $5E,%00000000
          !byte $5E,%00100000
          !byte $5E,%01000000
@@ -6722,3 +6722,7 @@
          !byte $02,%11010011
          !byte $00,%11010011
          !byte $80
+
+         !source "src/fx/fx.hgr.precomputed.1bit.a"
+         +FX_RIPPLE_1BIT aslmod2
+         rts
diff --git a/src/fx/fx.hgr.radial4.a b/src/fx/fx.hgr.radial4.a
index 281a647d2..b614635fd 100644
--- a/src/fx/fx.hgr.radial4.a
+++ b/src/fx/fx.hgr.radial4.a
@@ -8,7 +8,7 @@
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
          +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod2
+         jsr EndCoordinates1Bit+1
 
 Start
          !source "src/fx/fx.hgr.radial.common.a"
diff --git a/src/fx/fx.hgr.ripple.a b/src/fx/fx.hgr.ripple.a
index f16d597d1..cba14175a 100644
--- a/src/fx/fx.hgr.ripple.a
+++ b/src/fx/fx.hgr.ripple.a
@@ -8,7 +8,7 @@
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
          +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod2
+         jsr EndCoordinates1Bit+1
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 
diff --git a/src/fx/fx.hgr.slow.star.data.a b/src/fx/fx.hgr.slow.star.data.a
index b973e117c..77d401694 100644
--- a/src/fx/fx.hgr.slow.star.data.a
+++ b/src/fx/fx.hgr.slow.star.data.a
@@ -1,6 +1,6 @@
 !cpu 6502
 !to "build/FX/SLOW.STAR.DATA",plain
-*=$8800
+*=$8600
          !byte $30,%00001010
          !byte $30,%00101010
          !byte $30,%11001001
diff --git a/src/fx/fx.hgr.slow.star.ripple.a b/src/fx/fx.hgr.slow.star.ripple.a
index d272ce909..4813cbe7d 100644
--- a/src/fx/fx.hgr.slow.star.ripple.a
+++ b/src/fx/fx.hgr.slow.star.ripple.a
@@ -8,7 +8,7 @@
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
          +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod2
+         jsr EndCoordinates1Bit+1
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 
diff --git a/src/fx/fx.hgr.snowflake.data.a b/src/fx/fx.hgr.snowflake.data.a
index c6c43926e..9fb5b5d07 100644
--- a/src/fx/fx.hgr.snowflake.data.a
+++ b/src/fx/fx.hgr.snowflake.data.a
@@ -1,6 +1,6 @@
 !cpu 6502
 !to "build/FX/SNOWFLAKE.DATA",plain
-*=$8800
+*=$8600
          !byte $5E,%10110011
          !byte $5E,%11010011
          !byte $5C,%01010011
@@ -6722,3 +6722,7 @@
          !byte $5E,%00100000
          !byte $5E,%00000000
          !byte $80
+
+         !source "src/fx/fx.hgr.precomputed.1bit.a"
+         +FX_RIPPLE_1BIT aslmod2
+         rts
diff --git a/src/fx/fx.hgr.snowflake.ripple.a b/src/fx/fx.hgr.snowflake.ripple.a
index df9ae1fd1..97b3d875f 100644
--- a/src/fx/fx.hgr.snowflake.ripple.a
+++ b/src/fx/fx.hgr.snowflake.ripple.a
@@ -8,7 +8,7 @@
          !source "src/fx/fx.hgr.precomputed.1bit.a"
 
          +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod2
+         jsr EndCoordinates1Bit+1
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit