diff --git a/src/fx/fx.hgr.precomputed.2bit.a b/src/fx/fx.hgr.precomputed.2bit.a
index a67886eb6..d06c1c44c 100644
--- a/src/fx/fx.hgr.precomputed.2bit.a
+++ b/src/fx/fx.hgr.precomputed.2bit.a
@@ -86,14 +86,11 @@ hgr1himirror   = $BF40    ; $C0 bytes
          +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi
          +BUILD_MIRROR_COLS mirror_cols
          +BUILD_SPARSE_BITMASKS_2BIT copymasks, mirror_copymasks
-         ldx   #(end-start)          ; copy InputLoop code to zero page
--        lda   start-1, x
-         sta   $FF, x
+         ldx   #(end-start-1)        ; copy InputLoop code to zero page
+-        lda   start, x
+         sta   $0, x
          dex
-         bne   -
-         +LDADDR .coords
-         sta   <input
-         sty   <input+1
+         bpl   -
          lda   #0
          pha
          pha
@@ -103,7 +100,7 @@ Exit2Bit rts
 InputLoop
          ldy   #0
 input=*+1
-         lda   $FDFD, y              ; first value: HGR row + 1
+         lda   .coords, y            ; first value: HGR row + 1
          beq   Exit2Bit              ; if 0 then we're done
          tax
          +ROW_X_TO_2BIT_BASE_ADDRESSES
diff --git a/src/fx/fx.hgr.precomputed.3bit.a b/src/fx/fx.hgr.precomputed.3bit.a
index a7dadd0ee..f3e64a315 100644
--- a/src/fx/fx.hgr.precomputed.3bit.a
+++ b/src/fx/fx.hgr.precomputed.3bit.a
@@ -111,14 +111,11 @@ hgrhi3c        = $BE80    ; $80 bytes
          +BUILD_3BIT_HGR_LOOKUP_TABLES
          +BUILD_EXTRA_COLS
          +BUILD_SPARSE_BITMASKS_3BIT
-         ldx   #(end-start)          ; copy InputLoop code to zero page
--        lda   start-1, x
-         sta   $FF, x
+         ldx   #(end-start-1)        ; copy InputLoop code to zero page
+-        lda   start, x
+         sta   $0, x
          dex
-         bne   -
-         +LDADDR .coords
-         sta   <input
-         sty   <input+1
+         bpl   -
          lda   #0
          pha
          pha
@@ -128,7 +125,7 @@ Exit3Bit rts
 InputLoop
          ldy   #0
 input=*+1
-         lda   $FDFD, y
+         lda   .coords, y
          bmi   Exit3Bit              ; if high bit is 1 then we're done
          cmp   #$40
          php