Revert "load radial2 data from external files and transform it at runtime"

This reverts commit f2dbdb6bffe9c4839f88a8dcf307e6a97af57676.
We have label collisions in a full build.

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
+         +FX_RIPPLE_1BIT
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 

src/fx/fx.hgr.precomputed.1bit.a

@@ -174,7 +174,7 @@ InitOnce
 ++
 }
 
-!macro FX_RIPPLE_1BIT .target {
+!macro FX_RIPPLE_1BIT {
          lda   #2                    ; <(Coordinates1Bit + 2)
          sta   $f0
          ldy   #0
@@ -200,7 +200,7 @@ InitOnce
 ---      ldx   #4
 --       ldy   $ee, x
          lda   $ef, x
-         jsr   .target
+         jsr   aslmod
          sty   $ee, x
          sta   $ef, x
          sty   $ec
@@ -229,9 +229,8 @@ InitOnce
          dec   $ef
          bpl   ---
          bmi   +++                   ; always branches
-aslmod2
-         jsr   +
 aslmod
+         jsr   +
 +        cmp   #$1A
          bcc   +
          bne   ++

src/fx/fx.hgr.radial.common.a

@@ -1,43 +1,43 @@
-mirror_src1_rad   = $E8      ; word
-mirror_dest1_rad  = $EA      ; word
-mirror_src2_rad   = $EC      ; word
-mirror_dest2_rad  = $EE      ; word
-src1_rad          = $F0      ; word
-dest1_rad         = $F2      ; word
-src2_rad          = $F4      ; word
-dest2_rad         = $F6      ; word
-reverse_input     = $FC      ; word
-input_rad         = $FE      ; word
+mirror_src1    = $E8      ; word
+mirror_dest1   = $EA      ; word
+mirror_src2    = $EC      ; word
+mirror_dest2   = $EE      ; word
+src1           = $F0      ; word
+dest1          = $F2      ; word
+src2           = $F4      ; word
+dest2          = $F6      ; word
+reverse_input  = $FC      ; word
+input          = $FE      ; word
 
          +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi
          +BUILD_HGR_MIRROR_LOOKUP_TABLES hgrlomirror, hgr1himirror
          +BUILD_MIRROR_COLS mirror_cols
          +BUILD_SPARSE_BITMASKS copymasks, mirror_copymasks
          +LDADDR Coordinates
-         +ST16 input_rad
+         +ST16 input
          +LDADDR EndCoordinates-2
          +ST16 reverse_input
          jmp   Loop
 Exit     rts
 Loop     ldy   #0
-         lda   (input_rad),y
+         lda   (input),y
          bmi   Exit
          tax
          +ROW_X_TO_BASE_ADDRESSES
          +ROW_X_TO_MIRROR_ADDRESSES
-         inc   input_rad
-         lda   (input_rad),y
-         +HIGH_3_LOW_5 input_rad
+         inc   input
+         lda   (input),y
+         +HIGH_3_LOW_5 input
 
-         ; top-left quadrant (original row, original column, original input_rad order)
-         +COPY_BIT src1_rad, dest1_rad, copymasks
-         +COPY_BIT src2_rad, dest2_rad, copymasks
+         ; top-left quadrant (original row, original column, original input order)
+         +COPY_BIT src1, dest1, copymasks
+         +COPY_BIT src2, dest2, copymasks
 
-         ; bottom-right quadrant (opposite row, opposite column, original input_rad order)
+         ; bottom-right quadrant (opposite row, opposite column, original input order)
          lda   mirror_cols,y
          tay
-         +COPY_BIT mirror_src1_rad, mirror_dest1_rad, mirror_copymasks
-         +COPY_BIT mirror_src2_rad, mirror_dest2_rad, mirror_copymasks
+         +COPY_BIT mirror_src1, mirror_dest1, mirror_copymasks
+         +COPY_BIT mirror_src2, mirror_dest2, mirror_copymasks
 
          ldy   #0
          lda   (reverse_input),y
@@ -48,19 +48,19 @@ Loop     ldy   #0
          lda   (reverse_input),y
          +HIGH_3_LOW_5 reverse_input
 
-         ; bottom-left quadrant (opposite row, original column, reverse input_rad order)
-         +COPY_BIT mirror_src1_rad, mirror_dest1_rad, copymasks
-         +COPY_BIT mirror_src2_rad, mirror_dest2_rad, copymasks
+         ; bottom-left quadrant (opposite row, original column, reverse input order)
+         +COPY_BIT mirror_src1, mirror_dest1, copymasks
+         +COPY_BIT mirror_src2, mirror_dest2, copymasks
 
-         ; top-right quadrant (same row, opposite column, reverse input_rad order)
+         ; top-right quadrant (same row, opposite column, reverse input order)
          lda   mirror_cols,y
          tay
-         +COPY_BIT src1_rad, dest1_rad, mirror_copymasks
-         +COPY_BIT src2_rad, dest2_rad, mirror_copymasks
+         +COPY_BIT src1, dest1, mirror_copymasks
+         +COPY_BIT src2, dest2, mirror_copymasks
 
-         inc   input_rad
+         inc   input
          bne   +
-         inc   input_rad+1
+         inc   input+1
 +        lda   reverse_input
          beq   +
          dec   reverse_input

src/fx/fx.hgr.radial2.a

@@ -1,20 +1,17 @@
 ;license:MIT
-;(c) 2019-2020 by 4am/qkumba
+;(c) 2019 by 4am
 ;
 !cpu 6502
 !to "build/FX/RADIAL2",plain
 *=$6000
 
          !source "src/fx/fx.hgr.precomputed.1bit.a"
-
-         +FX_INITONCE_1BIT CoordinatesFile, Start
-         +FX_RIPPLE_1BIT aslmod
-Start
-Coordinates = Coordinates1Bit
-EndCoordinates = Coordinates + $3480
-         +FX_PRECOMPUTED_1BIT Coordinates1Bit
          !source "src/fx/fx.hgr.radial.common.a"
 
-CoordinatesFile
-         !byte 14
-         !text "FX/RADIAL.DATA"
+!if * and 1 {
+         !byte 0
+}
+Coordinates
+         !source "src/fx/fx.hgr.radial2.data.a"
+EndCoordinates
+         !byte $80

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
+         +FX_RIPPLE_1BIT
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 

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
+         +FX_RIPPLE_1BIT
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit
 

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
+         +FX_RIPPLE_1BIT
 Start
          +FX_PRECOMPUTED_1BIT Coordinates1Bit