diff --git a/Makefile b/Makefile index 9fa68bced..8a58c5ede 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,6 @@ dsk: index asmproboot asmlauncher extract # create _FileInformation.txt files for subdirectories # bin/buildfileinfo.sh res/ICONS "CA" "0000" - bin/buildfileinfo.sh build/FX "06" "6000" cp src/prelaunch/_FileInformation.txt build/PRELAUNCH/ # # add everything to the disk @@ -58,7 +57,6 @@ dsk: index asmproboot asmlauncher extract for f in \ res/TITLE.ANIMATED \ res/ICONS \ - build/FX \ build/PRELAUNCH \ build/X; do \ rm -f "$$f"/.DS_Store; \ @@ -137,6 +135,7 @@ index: preconditions md asmfx asmprelaunch asmdemo compress extract [ -f build/index ] || (bin/buildindexedfile.sh -p -a build/TOTAL.DATA build/FX.INDEXED < res/FX.CONF > build/FX.IDX) [ -f build/index ] || (bin/buildindexedfile.sh -p -a build/TOTAL.DATA build/FX.INDEXED < res/DFX.CONF > build/DFX.IDX) [ -f build/index ] || (bin/buildindexedfile.sh -p -a build/TOTAL.DATA build/FX.INDEXED < res/SFX.CONF > build/SFX.IDX) + [ -f build/index ] || ((for f in build/FX/*.DATA; do echo "$$(basename $$f)"; done) | bin/buildindexedfile.sh -p -a build/TOTAL.DATA build/FX > build/FXDATA.IDX) # # precompute indexed files for HGR & DHGR action screenshots # note: these can not be padded because they are compressed and the decompressor needs the exact size @@ -199,6 +198,7 @@ index: preconditions md asmfx asmprelaunch asmdemo compress extract [ -f build/index ] || bin/addfile.sh build/FX.IDX build/TOTAL.DATA > src/index/fx.idx.a [ -f build/index ] || bin/addfile.sh build/DFX.IDX build/TOTAL.DATA > src/index/dfx.idx.a [ -f build/index ] || bin/addfile.sh build/SFX.IDX build/TOTAL.DATA > src/index/sfx.idx.a + [ -f build/index ] || bin/addfile.sh build/FXDATA.IDX build/TOTAL.DATA > src/index/fxdata.idx.a [ -f build/index ] || bin/addfile.sh build/GAMEHELP.IDX build/TOTAL.DATA > src/index/gamehelp.idx.a [ -f build/index ] || bin/addfile.sh build/SLIDESHOW.IDX build/TOTAL.DATA > src/index/slideshow.idx.a [ -f build/index ] || bin/addfile.sh build/MINIATTRACT0.IDX build/TOTAL.DATA > src/index/miniattract0.idx.a diff --git a/src/4cade.a b/src/4cade.a index 4b53ec9ec..534d823e7 100644 --- a/src/4cade.a +++ b/src/4cade.a @@ -157,6 +157,9 @@ SwitchToBank2 rts !source "src/prodos.path.a" ; paths end up on the same page +; iLoadFXDATA (label is in constants.a) + jmp LoadFXDATA ; no direct calling - target can move + ; iLoadXSingle (label is in constants.a) jmp LoadXSingle ; no direct calling - target can move diff --git a/src/constants.a b/src/constants.a index f16cb2902..5cf10f5d1 100644 --- a/src/constants.a +++ b/src/constants.a @@ -170,6 +170,7 @@ gSearchIndex = $6000 gSearchCache = $A000 ; LC RAM 1 & 2 +iLoadFXDATA = $FFE6 iLoadXSingle = $FFE9 iAddToPath = $FFEC iLoadFileDirect = $FFEF ; note: you really want LC RAM 2 banked in before calling this diff --git a/src/fx/fx.dhgr.bubbles.a b/src/fx/fx.dhgr.bubbles.a index 1930e86be..9a67963a0 100644 --- a/src/fx/fx.dhgr.bubbles.a +++ b/src/fx/fx.dhgr.bubbles.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/BUBBLES.DATA" + +PSTRING "BUBBLES.DATA" diff --git a/src/fx/fx.dhgr.bubbles.in.a b/src/fx/fx.dhgr.bubbles.in.a index 65564164d..5a3fc53b0 100644 --- a/src/fx/fx.dhgr.bubbles.in.a +++ b/src/fx/fx.dhgr.bubbles.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/BUBBLES.DATA" + +PSTRING "BUBBLES.DATA" diff --git a/src/fx/fx.dhgr.butterfly.a b/src/fx/fx.dhgr.butterfly.a index 7668ff90d..a68bf3e35 100644 --- a/src/fx/fx.dhgr.butterfly.a +++ b/src/fx/fx.dhgr.butterfly.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.dhgr.butterfly.in.a b/src/fx/fx.dhgr.butterfly.in.a index f9e2424e6..3ff2a61ca 100644 --- a/src/fx/fx.dhgr.butterfly.in.a +++ b/src/fx/fx.dhgr.butterfly.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.dhgr.butterfly.ripple.a b/src/fx/fx.dhgr.butterfly.ripple.a index 16c9f2376..2c4f8f3ec 100644 --- a/src/fx/fx.dhgr.butterfly.ripple.a +++ b/src/fx/fx.dhgr.butterfly.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.dhgr.corner4.a b/src/fx/fx.dhgr.corner4.a index 433d105a9..062422af1 100644 --- a/src/fx/fx.dhgr.corner4.a +++ b/src/fx/fx.dhgr.corner4.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.dhgr.corner4.in.a b/src/fx/fx.dhgr.corner4.in.a index f59054a31..489b8ee5d 100644 --- a/src/fx/fx.dhgr.corner4.in.a +++ b/src/fx/fx.dhgr.corner4.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.dhgr.corner4.ripple.a b/src/fx/fx.dhgr.corner4.ripple.a index 931d91085..ff55ddd82 100644 --- a/src/fx/fx.dhgr.corner4.ripple.a +++ b/src/fx/fx.dhgr.corner4.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.dhgr.dither.bubbles.a b/src/fx/fx.dhgr.dither.bubbles.a index 32584cd34..223970850 100644 --- a/src/fx/fx.dhgr.dither.bubbles.a +++ b/src/fx/fx.dhgr.dither.bubbles.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 15 - !text "FX/BUBBLES.DATA" + +PSTRING "BUBBLES.DATA" diff --git a/src/fx/fx.dhgr.dither.butterfly.a b/src/fx/fx.dhgr.dither.butterfly.a index 6ca85e296..90661bf69 100644 --- a/src/fx/fx.dhgr.dither.butterfly.a +++ b/src/fx/fx.dhgr.dither.butterfly.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.dhgr.dither.corner4.a b/src/fx/fx.dhgr.dither.corner4.a index 46b9ae829..7d48d0da6 100644 --- a/src/fx/fx.dhgr.dither.corner4.a +++ b/src/fx/fx.dhgr.dither.corner4.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.dhgr.dither.heart.a b/src/fx/fx.dhgr.dither.heart.a index cdd1a823d..8b5e55ae9 100644 --- a/src/fx/fx.dhgr.dither.heart.a +++ b/src/fx/fx.dhgr.dither.heart.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.dhgr.dither.iris.a b/src/fx/fx.dhgr.dither.iris.a index d16f598c1..fa543d364 100644 --- a/src/fx/fx.dhgr.dither.iris.a +++ b/src/fx/fx.dhgr.dither.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.dhgr.dither.maple.a b/src/fx/fx.dhgr.dither.maple.a index cf976eb7a..0b4e21d19 100644 --- a/src/fx/fx.dhgr.dither.maple.a +++ b/src/fx/fx.dhgr.dither.maple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.dhgr.dither.radial.a b/src/fx/fx.dhgr.dither.radial.a index 643310304..df29884fd 100644 --- a/src/fx/fx.dhgr.dither.radial.a +++ b/src/fx/fx.dhgr.dither.radial.a @@ -154,5 +154,4 @@ DoneBR rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.dhgr.dither.radial2.a b/src/fx/fx.dhgr.dither.radial2.a index 80ffbe622..78365e1c7 100644 --- a/src/fx/fx.dhgr.dither.radial2.a +++ b/src/fx/fx.dhgr.dither.radial2.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.dhgr.dither.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +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 f9a4ae41d..e6f1f33c3 100644 --- a/src/fx/fx.dhgr.dither.radial4.a +++ b/src/fx/fx.dhgr.dither.radial4.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.dhgr.dither.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.dhgr.dither.slow.star.a b/src/fx/fx.dhgr.dither.slow.star.a index c93876c25..ce16ff3cf 100644 --- a/src/fx/fx.dhgr.dither.slow.star.a +++ b/src/fx/fx.dhgr.dither.slow.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.dhgr.dither.snowflake.a b/src/fx/fx.dhgr.dither.snowflake.a index cc26e4c1d..242301331 100644 --- a/src/fx/fx.dhgr.dither.snowflake.a +++ b/src/fx/fx.dhgr.dither.snowflake.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.dhgr.dither.soft.iris.a b/src/fx/fx.dhgr.dither.soft.iris.a index c6ed832da..6b49bde26 100644 --- a/src/fx/fx.dhgr.dither.soft.iris.a +++ b/src/fx/fx.dhgr.dither.soft.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.dhgr.dither.star.a b/src/fx/fx.dhgr.dither.star.a index ab1403e2b..8762ef06a 100644 --- a/src/fx/fx.dhgr.dither.star.a +++ b/src/fx/fx.dhgr.dither.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.dhgr.dither.star7.a b/src/fx/fx.dhgr.dither.star7.a index adf581f6a..f6c7c7f6c 100644 --- a/src/fx/fx.dhgr.dither.star7.a +++ b/src/fx/fx.dhgr.dither.star7.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.dhgr.dither.wavy.iris.a b/src/fx/fx.dhgr.dither.wavy.iris.a index 865e224d8..05e5a6448 100644 --- a/src/fx/fx.dhgr.dither.wavy.iris.a +++ b/src/fx/fx.dhgr.dither.wavy.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.dhgr.dither.wavy.iris.bloom.a b/src/fx/fx.dhgr.dither.wavy.iris.bloom.a index 9745a3f57..0f1ae8ea4 100644 --- a/src/fx/fx.dhgr.dither.wavy.iris.bloom.a +++ b/src/fx/fx.dhgr.dither.wavy.iris.bloom.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.dhgr.heart.a b/src/fx/fx.dhgr.heart.a index a677c0f34..a4e3b4118 100644 --- a/src/fx/fx.dhgr.heart.a +++ b/src/fx/fx.dhgr.heart.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.dhgr.heart.in.a b/src/fx/fx.dhgr.heart.in.a index 9fd89db76..2dff4cfcf 100644 --- a/src/fx/fx.dhgr.heart.in.a +++ b/src/fx/fx.dhgr.heart.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.dhgr.heart.ripple.a b/src/fx/fx.dhgr.heart.ripple.a index c30649efc..6010a0e40 100644 --- a/src/fx/fx.dhgr.heart.ripple.a +++ b/src/fx/fx.dhgr.heart.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.dhgr.iris.a b/src/fx/fx.dhgr.iris.a index 7b85fd6cb..e69fddd7d 100644 --- a/src/fx/fx.dhgr.iris.a +++ b/src/fx/fx.dhgr.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.dhgr.iris.in.a b/src/fx/fx.dhgr.iris.in.a index 4fc5849fb..f9fdb8402 100644 --- a/src/fx/fx.dhgr.iris.in.a +++ b/src/fx/fx.dhgr.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.dhgr.maple.a b/src/fx/fx.dhgr.maple.a index 735413918..0affaf7c7 100644 --- a/src/fx/fx.dhgr.maple.a +++ b/src/fx/fx.dhgr.maple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.dhgr.maple.in.a b/src/fx/fx.dhgr.maple.in.a index aa1c5990e..35ffa34b7 100644 --- a/src/fx/fx.dhgr.maple.in.a +++ b/src/fx/fx.dhgr.maple.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.dhgr.maple.ripple.a b/src/fx/fx.dhgr.maple.ripple.a index 636f60fbe..bed82bd47 100644 --- a/src/fx/fx.dhgr.maple.ripple.a +++ b/src/fx/fx.dhgr.maple.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.dhgr.radial.a b/src/fx/fx.dhgr.radial.a index 16e49c366..b5e5bded3 100644 --- a/src/fx/fx.dhgr.radial.a +++ b/src/fx/fx.dhgr.radial.a @@ -137,5 +137,4 @@ DoneBR rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.dhgr.radial2.a b/src/fx/fx.dhgr.radial2.a index c60413a71..1cf244c20 100644 --- a/src/fx/fx.dhgr.radial2.a +++ b/src/fx/fx.dhgr.radial2.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.dhgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.dhgr.radial3.a b/src/fx/fx.dhgr.radial3.a index 92485149b..4cd81d6d6 100644 --- a/src/fx/fx.dhgr.radial3.a +++ b/src/fx/fx.dhgr.radial3.a @@ -129,5 +129,4 @@ Loop ldy #0 + rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.dhgr.radial4.a b/src/fx/fx.dhgr.radial4.a index a9dd46fbe..b48091257 100644 --- a/src/fx/fx.dhgr.radial4.a +++ b/src/fx/fx.dhgr.radial4.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.dhgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.dhgr.radial5.a b/src/fx/fx.dhgr.radial5.a index 7e7bcf73b..bfdbe1f15 100644 --- a/src/fx/fx.dhgr.radial5.a +++ b/src/fx/fx.dhgr.radial5.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.dhgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.dhgr.ripple.a b/src/fx/fx.dhgr.ripple.a index 28311e95e..a0a281ca6 100644 --- a/src/fx/fx.dhgr.ripple.a +++ b/src/fx/fx.dhgr.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.dhgr.slow.star.a b/src/fx/fx.dhgr.slow.star.a index 6f141554a..96431a55c 100644 --- a/src/fx/fx.dhgr.slow.star.a +++ b/src/fx/fx.dhgr.slow.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.dhgr.slow.star.in.a b/src/fx/fx.dhgr.slow.star.in.a index fc2c30b54..c0b5b8ff6 100644 --- a/src/fx/fx.dhgr.slow.star.in.a +++ b/src/fx/fx.dhgr.slow.star.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.dhgr.slow.star.ripple.a b/src/fx/fx.dhgr.slow.star.ripple.a index e3c2b1906..48a932deb 100644 --- a/src/fx/fx.dhgr.slow.star.ripple.a +++ b/src/fx/fx.dhgr.slow.star.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.dhgr.snowflake.a b/src/fx/fx.dhgr.snowflake.a index c60c7a46e..178481c0b 100644 --- a/src/fx/fx.dhgr.snowflake.a +++ b/src/fx/fx.dhgr.snowflake.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.dhgr.snowflake.in.a b/src/fx/fx.dhgr.snowflake.in.a index 868b690f4..b7ae1dd65 100644 --- a/src/fx/fx.dhgr.snowflake.in.a +++ b/src/fx/fx.dhgr.snowflake.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.dhgr.snowflake.ripple.a b/src/fx/fx.dhgr.snowflake.ripple.a index 90f3bbb38..7fbac1c0b 100644 --- a/src/fx/fx.dhgr.snowflake.ripple.a +++ b/src/fx/fx.dhgr.snowflake.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.dhgr.soft.iris.a b/src/fx/fx.dhgr.soft.iris.a index 8b2eca059..5b3987a88 100644 --- a/src/fx/fx.dhgr.soft.iris.a +++ b/src/fx/fx.dhgr.soft.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.dhgr.soft.iris.in.a b/src/fx/fx.dhgr.soft.iris.in.a index 4df4e3154..e5d3488d0 100644 --- a/src/fx/fx.dhgr.soft.iris.in.a +++ b/src/fx/fx.dhgr.soft.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.dhgr.star.a b/src/fx/fx.dhgr.star.a index e9523d95b..7b9def13e 100644 --- a/src/fx/fx.dhgr.star.a +++ b/src/fx/fx.dhgr.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.dhgr.star.in.a b/src/fx/fx.dhgr.star.in.a index d8c2574d6..13c05bf7a 100644 --- a/src/fx/fx.dhgr.star.in.a +++ b/src/fx/fx.dhgr.star.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.dhgr.star.ripple.a b/src/fx/fx.dhgr.star.ripple.a index 2e48b4045..57de8ae39 100644 --- a/src/fx/fx.dhgr.star.ripple.a +++ b/src/fx/fx.dhgr.star.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.dhgr.star7.a b/src/fx/fx.dhgr.star7.a index 546c71759..4f43642dd 100644 --- a/src/fx/fx.dhgr.star7.a +++ b/src/fx/fx.dhgr.star7.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.dhgr.star7.in.a b/src/fx/fx.dhgr.star7.in.a index af1eeb51c..f64cdef71 100644 --- a/src/fx/fx.dhgr.star7.in.a +++ b/src/fx/fx.dhgr.star7.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.dhgr.star7.ripple.a b/src/fx/fx.dhgr.star7.ripple.a index a28c9f6c4..58d169556 100644 --- a/src/fx/fx.dhgr.star7.ripple.a +++ b/src/fx/fx.dhgr.star7.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.dhgr.swirl.a b/src/fx/fx.dhgr.swirl.a index c7a270a61..992502eea 100644 --- a/src/fx/fx.dhgr.swirl.a +++ b/src/fx/fx.dhgr.swirl.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT_DHGR Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.dhgr.wavy.iris.a b/src/fx/fx.dhgr.wavy.iris.a index 1740b0dce..5bcca20bc 100644 --- a/src/fx/fx.dhgr.wavy.iris.a +++ b/src/fx/fx.dhgr.wavy.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.dhgr.wavy.iris.bloom.a b/src/fx/fx.dhgr.wavy.iris.bloom.a index b732dc976..975ef62cf 100644 --- a/src/fx/fx.dhgr.wavy.iris.bloom.a +++ b/src/fx/fx.dhgr.wavy.iris.bloom.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.dhgr.wavy.iris.bloom.in.a b/src/fx/fx.dhgr.wavy.iris.bloom.in.a index f29cbaf0c..9818db597 100644 --- a/src/fx/fx.dhgr.wavy.iris.bloom.in.a +++ b/src/fx/fx.dhgr.wavy.iris.bloom.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.dhgr.wavy.iris.in.a b/src/fx/fx.dhgr.wavy.iris.in.a index 1cbefb8aa..a320ac6bd 100644 --- a/src/fx/fx.dhgr.wavy.iris.in.a +++ b/src/fx/fx.dhgr.wavy.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.dhgr.wavy.ripple.a b/src/fx/fx.dhgr.wavy.ripple.a index 9769d8fa1..e06cabc8b 100644 --- a/src/fx/fx.dhgr.wavy.ripple.a +++ b/src/fx/fx.dhgr.wavy.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.dhgr.wavy.ripple.bloom.a b/src/fx/fx.dhgr.wavy.ripple.bloom.a index c6476e88b..5c3b6c2e3 100644 --- a/src/fx/fx.dhgr.wavy.ripple.bloom.a +++ b/src/fx/fx.dhgr.wavy.ripple.bloom.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT_DHGR Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.hgr.apple.a b/src/fx/fx.hgr.apple.a index 6c25e9467..d3acab0af 100644 --- a/src/fx/fx.hgr.apple.a +++ b/src/fx/fx.hgr.apple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 13 - !text "FX/APPLE.DATA" + +PSTRING "APPLE.DATA" diff --git a/src/fx/fx.hgr.apple.in.a b/src/fx/fx.hgr.apple.in.a index 49c728347..e972f90a2 100644 --- a/src/fx/fx.hgr.apple.in.a +++ b/src/fx/fx.hgr.apple.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 13 - !text "FX/APPLE.DATA" + +PSTRING "APPLE.DATA" diff --git a/src/fx/fx.hgr.apple.ripple.a b/src/fx/fx.hgr.apple.ripple.a index 738615dd2..4b37650b8 100644 --- a/src/fx/fx.hgr.apple.ripple.a +++ b/src/fx/fx.hgr.apple.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 13 - !text "FX/APPLE.DATA" + +PSTRING "APPLE.DATA" diff --git a/src/fx/fx.hgr.bolt.a b/src/fx/fx.hgr.bolt.a index 7a6d89b91..2ad0ea3f7 100644 --- a/src/fx/fx.hgr.bolt.a +++ b/src/fx/fx.hgr.bolt.a @@ -15,5 +15,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 12 - !text "FX/BOLT.DATA" + !text 9,"BOLT.DATA" diff --git a/src/fx/fx.hgr.bolt.in.a b/src/fx/fx.hgr.bolt.in.a index 1bece0dad..a3d71c58c 100644 --- a/src/fx/fx.hgr.bolt.in.a +++ b/src/fx/fx.hgr.bolt.in.a @@ -16,5 +16,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 12 - !text "FX/BOLT.DATA" + !text 9,"BOLT.DATA" diff --git a/src/fx/fx.hgr.bolt.ripple.a b/src/fx/fx.hgr.bolt.ripple.a index 2dfd0cc25..4f536eebf 100644 --- a/src/fx/fx.hgr.bolt.ripple.a +++ b/src/fx/fx.hgr.bolt.ripple.a @@ -16,5 +16,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 12 - !text "FX/BOLT.DATA" + !text 9,"BOLT.DATA" diff --git a/src/fx/fx.hgr.bubbles.a b/src/fx/fx.hgr.bubbles.a index ba4b39563..2be8dc2a6 100644 --- a/src/fx/fx.hgr.bubbles.a +++ b/src/fx/fx.hgr.bubbles.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/BUBBLES.DATA" + +PSTRING "BUBBLES.DATA" diff --git a/src/fx/fx.hgr.bubbles.in.a b/src/fx/fx.hgr.bubbles.in.a index 218e1fea9..95e28af49 100644 --- a/src/fx/fx.hgr.bubbles.in.a +++ b/src/fx/fx.hgr.bubbles.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/BUBBLES.DATA" + +PSTRING "BUBBLES.DATA" diff --git a/src/fx/fx.hgr.butterfly.a b/src/fx/fx.hgr.butterfly.a index 7537b62d4..e64696cff 100644 --- a/src/fx/fx.hgr.butterfly.a +++ b/src/fx/fx.hgr.butterfly.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.hgr.butterfly.in.a b/src/fx/fx.hgr.butterfly.in.a index e5087fb6e..8fbd35814 100644 --- a/src/fx/fx.hgr.butterfly.in.a +++ b/src/fx/fx.hgr.butterfly.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.hgr.butterfly.ripple.a b/src/fx/fx.hgr.butterfly.ripple.a index 01d0b41b2..cc4b82d29 100644 --- a/src/fx/fx.hgr.butterfly.ripple.a +++ b/src/fx/fx.hgr.butterfly.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.hgr.corner4.a b/src/fx/fx.hgr.corner4.a index e35be850b..50bed8ad4 100644 --- a/src/fx/fx.hgr.corner4.a +++ b/src/fx/fx.hgr.corner4.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.hgr.corner4.in.a b/src/fx/fx.hgr.corner4.in.a index 21f40bd6b..7c0ea69fa 100644 --- a/src/fx/fx.hgr.corner4.in.a +++ b/src/fx/fx.hgr.corner4.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.hgr.corner4.ripple.a b/src/fx/fx.hgr.corner4.ripple.a index a94f58a99..cef86eef4 100644 --- a/src/fx/fx.hgr.corner4.ripple.a +++ b/src/fx/fx.hgr.corner4.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.hgr.dither.apple.a b/src/fx/fx.hgr.dither.apple.a index 5c9d72ace..149438cbd 100644 --- a/src/fx/fx.hgr.dither.apple.a +++ b/src/fx/fx.hgr.dither.apple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT_DITHER Coordinates3Bit, EndCoordinates3Bit CoordinatesFile - !byte 13 - !text "FX/APPLE.DATA" + +PSTRING "APPLE.DATA" diff --git a/src/fx/fx.hgr.dither.bolt.a b/src/fx/fx.hgr.dither.bolt.a index 2d11066a3..37b7a4ad5 100644 --- a/src/fx/fx.hgr.dither.bolt.a +++ b/src/fx/fx.hgr.dither.bolt.a @@ -15,5 +15,4 @@ Start +FX_PRECOMPUTED_3BIT_DITHER Coordinates3Bit, EndCoordinates3Bit CoordinatesFile - !byte 12 - !text "FX/BOLT.DATA" + !text 9,"BOLT.DATA" diff --git a/src/fx/fx.hgr.dither.butterfly.a b/src/fx/fx.hgr.dither.butterfly.a index ad73ccf86..6b99ee2cb 100644 --- a/src/fx/fx.hgr.dither.butterfly.a +++ b/src/fx/fx.hgr.dither.butterfly.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/BUTTERFLY.DATA" + +PSTRING "BUTTERFLY.DATA" diff --git a/src/fx/fx.hgr.dither.corner4.a b/src/fx/fx.hgr.dither.corner4.a index 36c7bc905..5b34705b9 100644 --- a/src/fx/fx.hgr.dither.corner4.a +++ b/src/fx/fx.hgr.dither.corner4.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.hgr.dither.flower.a b/src/fx/fx.hgr.dither.flower.a index a424a6d26..e4f45bd6d 100644 --- a/src/fx/fx.hgr.dither.flower.a +++ b/src/fx/fx.hgr.dither.flower.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT_DITHER Coordinates3Bit, EndCoordinates3Bit CoordinatesFile - !byte 14 - !text "FX/FLOWER.DATA" + +PSTRING "FLOWER.DATA" diff --git a/src/fx/fx.hgr.dither.flower.radial.a b/src/fx/fx.hgr.dither.flower.radial.a index ac8733258..e93420ab9 100644 --- a/src/fx/fx.hgr.dither.flower.radial.a +++ b/src/fx/fx.hgr.dither.flower.radial.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT_DITHER Coordinates3Bit, EndCoordinates3Bit CoordinatesFile - !byte 18 - !text "FX/FLOWER.RAD.DATA" + +PSTRING "FLOWER.RAD.DATA" diff --git a/src/fx/fx.hgr.dither.heart.a b/src/fx/fx.hgr.dither.heart.a index c9bd202f3..ac1f76f7b 100644 --- a/src/fx/fx.hgr.dither.heart.a +++ b/src/fx/fx.hgr.dither.heart.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.hgr.dither.iris.a b/src/fx/fx.hgr.dither.iris.a index 0061b928e..be13a0517 100644 --- a/src/fx/fx.hgr.dither.iris.a +++ b/src/fx/fx.hgr.dither.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.hgr.dither.mandelbrot.a b/src/fx/fx.hgr.dither.mandelbrot.a index 00767b4da..fe71b64da 100644 --- a/src/fx/fx.hgr.dither.mandelbrot.a +++ b/src/fx/fx.hgr.dither.mandelbrot.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT_DITHER Coordinates3Bit, EndCoordinates3Bit CoordinatesFile - !byte 18 - !text "FX/MANDELBROT.DATA" + +PSTRING "MANDELBROT.DATA" diff --git a/src/fx/fx.hgr.dither.maple.a b/src/fx/fx.hgr.dither.maple.a index a57ff6ccb..aa8830e73 100644 --- a/src/fx/fx.hgr.dither.maple.a +++ b/src/fx/fx.hgr.dither.maple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.hgr.dither.radial.a b/src/fx/fx.hgr.dither.radial.a index d6fa95f7b..009c53a6c 100644 --- a/src/fx/fx.hgr.dither.radial.a +++ b/src/fx/fx.hgr.dither.radial.a @@ -113,5 +113,4 @@ DoneBR rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.hgr.dither.radial2.a b/src/fx/fx.hgr.dither.radial2.a index 27f903658..18a1847e6 100644 --- a/src/fx/fx.hgr.dither.radial2.a +++ b/src/fx/fx.hgr.dither.radial2.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.dither.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +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 8e8c80b4a..19a3c138d 100644 --- a/src/fx/fx.hgr.dither.radial4.a +++ b/src/fx/fx.hgr.dither.radial4.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.dither.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +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 3e6fe1f28..b9d8eb5f4 100644 --- a/src/fx/fx.hgr.dither.radial5.a +++ b/src/fx/fx.hgr.dither.radial5.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.dither.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.hgr.dither.slow.star.a b/src/fx/fx.hgr.dither.slow.star.a index 34b74345b..01a8c87bf 100644 --- a/src/fx/fx.hgr.dither.slow.star.a +++ b/src/fx/fx.hgr.dither.slow.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.hgr.dither.snowflake.a b/src/fx/fx.hgr.dither.snowflake.a index 97b760d53..671872a53 100644 --- a/src/fx/fx.hgr.dither.snowflake.a +++ b/src/fx/fx.hgr.dither.snowflake.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT_DITHER Coordinates1Bit, EndCoordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.hgr.dither.soft.iris.a b/src/fx/fx.hgr.dither.soft.iris.a index b985af3b3..b8ecd9907 100644 --- a/src/fx/fx.hgr.dither.soft.iris.a +++ b/src/fx/fx.hgr.dither.soft.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.hgr.dither.star.a b/src/fx/fx.hgr.dither.star.a index 1016b9bf2..c24e9aa7a 100644 --- a/src/fx/fx.hgr.dither.star.a +++ b/src/fx/fx.hgr.dither.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.hgr.dither.star7.a b/src/fx/fx.hgr.dither.star7.a index 01df48c23..2593dd476 100644 --- a/src/fx/fx.hgr.dither.star7.a +++ b/src/fx/fx.hgr.dither.star7.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.hgr.dither.wavy.iris.a b/src/fx/fx.hgr.dither.wavy.iris.a index fa50bbe12..532ace278 100644 --- a/src/fx/fx.hgr.dither.wavy.iris.a +++ b/src/fx/fx.hgr.dither.wavy.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT_DITHER Coordinates2Bit, EndCoordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.hgr.flower.a b/src/fx/fx.hgr.flower.a index 3f9d46a7d..b3d78c120 100644 --- a/src/fx/fx.hgr.flower.a +++ b/src/fx/fx.hgr.flower.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 14 - !text "FX/FLOWER.DATA" + +PSTRING "FLOWER.DATA" diff --git a/src/fx/fx.hgr.flower.in.a b/src/fx/fx.hgr.flower.in.a index df3b6689e..cbea4974b 100644 --- a/src/fx/fx.hgr.flower.in.a +++ b/src/fx/fx.hgr.flower.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 14 - !text "FX/FLOWER.DATA" + +PSTRING "FLOWER.DATA" diff --git a/src/fx/fx.hgr.flower.radial.a b/src/fx/fx.hgr.flower.radial.a index adcd12f80..084280001 100644 --- a/src/fx/fx.hgr.flower.radial.a +++ b/src/fx/fx.hgr.flower.radial.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/FLOWER.RAD.DATA" + +PSTRING "FLOWER.RAD.DATA" diff --git a/src/fx/fx.hgr.flower.radial.in.a b/src/fx/fx.hgr.flower.radial.in.a index 3690b034f..04e02af09 100644 --- a/src/fx/fx.hgr.flower.radial.in.a +++ b/src/fx/fx.hgr.flower.radial.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/FLOWER.RAD.DATA" + +PSTRING "FLOWER.RAD.DATA" diff --git a/src/fx/fx.hgr.flower.radial.ripple.a b/src/fx/fx.hgr.flower.radial.ripple.a index b9c9162f2..23e0a2680 100644 --- a/src/fx/fx.hgr.flower.radial.ripple.a +++ b/src/fx/fx.hgr.flower.radial.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/FLOWER.RAD.DATA" + +PSTRING "FLOWER.RAD.DATA" diff --git a/src/fx/fx.hgr.flower.ripple.a b/src/fx/fx.hgr.flower.ripple.a index 9d498ab4f..2fb1427d2 100644 --- a/src/fx/fx.hgr.flower.ripple.a +++ b/src/fx/fx.hgr.flower.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 14 - !text "FX/FLOWER.DATA" + +PSTRING "FLOWER.DATA" diff --git a/src/fx/fx.hgr.heart.a b/src/fx/fx.hgr.heart.a index 2cd9ce727..7ce41969c 100644 --- a/src/fx/fx.hgr.heart.a +++ b/src/fx/fx.hgr.heart.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.hgr.heart.in.a b/src/fx/fx.hgr.heart.in.a index 45a40c138..191787ed3 100644 --- a/src/fx/fx.hgr.heart.in.a +++ b/src/fx/fx.hgr.heart.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.hgr.heart.ripple.a b/src/fx/fx.hgr.heart.ripple.a index 3fbda65c5..814a0a348 100644 --- a/src/fx/fx.hgr.heart.ripple.a +++ b/src/fx/fx.hgr.heart.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/HEART.DATA" + +PSTRING "HEART.DATA" diff --git a/src/fx/fx.hgr.iris.a b/src/fx/fx.hgr.iris.a index bf29be0c7..4e6fd4917 100644 --- a/src/fx/fx.hgr.iris.a +++ b/src/fx/fx.hgr.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.hgr.iris.in.a b/src/fx/fx.hgr.iris.in.a index b567115f6..f21a9c3e6 100644 --- a/src/fx/fx.hgr.iris.in.a +++ b/src/fx/fx.hgr.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.hgr.mandelbrot.a b/src/fx/fx.hgr.mandelbrot.a index 583094578..2cf042937 100644 --- a/src/fx/fx.hgr.mandelbrot.a +++ b/src/fx/fx.hgr.mandelbrot.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/MANDELBROT.DATA" + +PSTRING "MANDELBROT.DATA" diff --git a/src/fx/fx.hgr.mandelbrot.in.a b/src/fx/fx.hgr.mandelbrot.in.a index bca76ccfb..d5d43b654 100644 --- a/src/fx/fx.hgr.mandelbrot.in.a +++ b/src/fx/fx.hgr.mandelbrot.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/MANDELBROT.DATA" + +PSTRING "MANDELBROT.DATA" diff --git a/src/fx/fx.hgr.mandelbrot.ripple.a b/src/fx/fx.hgr.mandelbrot.ripple.a index 672a51530..7b2adde96 100644 --- a/src/fx/fx.hgr.mandelbrot.ripple.a +++ b/src/fx/fx.hgr.mandelbrot.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_3BIT Coordinates3Bit CoordinatesFile - !byte 18 - !text "FX/MANDELBROT.DATA" + +PSTRING "MANDELBROT.DATA" diff --git a/src/fx/fx.hgr.maple.a b/src/fx/fx.hgr.maple.a index 8f98b6341..cba74d7c5 100644 --- a/src/fx/fx.hgr.maple.a +++ b/src/fx/fx.hgr.maple.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.hgr.maple.in.a b/src/fx/fx.hgr.maple.in.a index 5afbd9a1b..c706323d9 100644 --- a/src/fx/fx.hgr.maple.in.a +++ b/src/fx/fx.hgr.maple.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.hgr.maple.ripple.a b/src/fx/fx.hgr.maple.ripple.a index af5fbbab5..004296d1f 100644 --- a/src/fx/fx.hgr.maple.ripple.a +++ b/src/fx/fx.hgr.maple.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/MAPLE.DATA" + +PSTRING "MAPLE.DATA" diff --git a/src/fx/fx.hgr.precomputed.1bit.a b/src/fx/fx.hgr.precomputed.1bit.a index af361007e..9e4a0edd7 100644 --- a/src/fx/fx.hgr.precomputed.1bit.a +++ b/src/fx/fx.hgr.precomputed.1bit.a @@ -53,9 +53,11 @@ InitOnce bit .Start lda #$4C sta InitOnce - +READ_RAM2_WRITE_RAM2 - +LOAD_FILE_AT .CoordinatesFile, Coordinates1Bit - +READ_RAM1_WRITE_RAM1 + + +LDADDR .CoordinatesFile + ldx #>Coordinates1Bit + jsr iLoadFXDATA + ; data file must contain this EOF marker ;lda #$80 ;sta EndCoordinates1Bit diff --git a/src/fx/fx.hgr.precomputed.2bit.a b/src/fx/fx.hgr.precomputed.2bit.a index d72df4407..73f8802ad 100644 --- a/src/fx/fx.hgr.precomputed.2bit.a +++ b/src/fx/fx.hgr.precomputed.2bit.a @@ -75,9 +75,11 @@ InitOnce bit .Start lda #$4C sta InitOnce - +READ_RAM2_WRITE_RAM2 - +LOAD_FILE_AT .CoordinatesFile, Coordinates2Bit - +READ_RAM1_WRITE_RAM1 + + +LDADDR .CoordinatesFile + ldx #>Coordinates2Bit + jsr iLoadFXDATA + lda #$00 sta EndCoordinates2Bit } diff --git a/src/fx/fx.hgr.precomputed.3bit.a b/src/fx/fx.hgr.precomputed.3bit.a index 49e155921..8d3cdcd55 100644 --- a/src/fx/fx.hgr.precomputed.3bit.a +++ b/src/fx/fx.hgr.precomputed.3bit.a @@ -124,9 +124,11 @@ InitOnce bit .Start lda #$4C sta InitOnce - +READ_RAM2_WRITE_RAM2 - +LOAD_FILE_AT .CoordinatesFile, Coordinates3Bit - +READ_RAM1_WRITE_RAM1 + + +LDADDR .CoordinatesFile + ldx #>Coordinates3Bit + jsr iLoadFXDATA + sec ror Coordinates3Bit + $5000 } diff --git a/src/fx/fx.hgr.radial.a b/src/fx/fx.hgr.radial.a index a0b46b781..299bb9b3c 100644 --- a/src/fx/fx.hgr.radial.a +++ b/src/fx/fx.hgr.radial.a @@ -97,5 +97,4 @@ DoneBR rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.hgr.radial2.a b/src/fx/fx.hgr.radial2.a index fcab75be5..c6b81dab5 100644 --- a/src/fx/fx.hgr.radial2.a +++ b/src/fx/fx.hgr.radial2.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.hgr.radial3.a b/src/fx/fx.hgr.radial3.a index 737b0ca46..ecc1f5edb 100644 --- a/src/fx/fx.hgr.radial3.a +++ b/src/fx/fx.hgr.radial3.a @@ -86,5 +86,4 @@ Loop ldy #0 ++ rts CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" diff --git a/src/fx/fx.hgr.radial4.a b/src/fx/fx.hgr.radial4.a index 20c8f69eb..4990d3319 100644 --- a/src/fx/fx.hgr.radial4.a +++ b/src/fx/fx.hgr.radial4.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.hgr.radial5.a b/src/fx/fx.hgr.radial5.a index d8264e66d..4aea894d0 100644 --- a/src/fx/fx.hgr.radial5.a +++ b/src/fx/fx.hgr.radial5.a @@ -14,7 +14,6 @@ Start !source "src/fx/fx.hgr.radial.common.a" CoordinatesFile - !byte 14 - !text "FX/RADIAL.DATA" + +PSTRING "RADIAL.DATA" Coordinates=Coordinates1Bit EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.hgr.ripple.a b/src/fx/fx.hgr.ripple.a index 596863114..c3ed603c5 100644 --- a/src/fx/fx.hgr.ripple.a +++ b/src/fx/fx.hgr.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 12 - !text "FX/IRIS.DATA" + +PSTRING "IRIS.DATA" diff --git a/src/fx/fx.hgr.slow.star.a b/src/fx/fx.hgr.slow.star.a index 7c8394d2a..112418b64 100644 --- a/src/fx/fx.hgr.slow.star.a +++ b/src/fx/fx.hgr.slow.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +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 add2bd407..7419c6d79 100644 --- a/src/fx/fx.hgr.slow.star.in.a +++ b/src/fx/fx.hgr.slow.star.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +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 aa3401356..2ea814e86 100644 --- a/src/fx/fx.hgr.slow.star.ripple.a +++ b/src/fx/fx.hgr.slow.star.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SLOW.STAR.DATA" + +PSTRING "SLOW.STAR.DATA" diff --git a/src/fx/fx.hgr.snowflake.a b/src/fx/fx.hgr.snowflake.a index 7d06a9cee..bdd8b8eb0 100644 --- a/src/fx/fx.hgr.snowflake.a +++ b/src/fx/fx.hgr.snowflake.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.hgr.snowflake.in.a b/src/fx/fx.hgr.snowflake.in.a index 425eb265e..ff3e779d3 100644 --- a/src/fx/fx.hgr.snowflake.in.a +++ b/src/fx/fx.hgr.snowflake.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.hgr.snowflake.ripple.a b/src/fx/fx.hgr.snowflake.ripple.a index 3cc75e0fd..f3fe7016c 100644 --- a/src/fx/fx.hgr.snowflake.ripple.a +++ b/src/fx/fx.hgr.snowflake.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 17 - !text "FX/SNOWFLAKE.DATA" + +PSTRING "SNOWFLAKE.DATA" diff --git a/src/fx/fx.hgr.soft.iris.a b/src/fx/fx.hgr.soft.iris.a index bd78ef82a..907b6822a 100644 --- a/src/fx/fx.hgr.soft.iris.a +++ b/src/fx/fx.hgr.soft.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.hgr.soft.iris.in.a b/src/fx/fx.hgr.soft.iris.in.a index 9c747dc8d..885eec232 100644 --- a/src/fx/fx.hgr.soft.iris.in.a +++ b/src/fx/fx.hgr.soft.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/SOFT.IRIS.DATA" + +PSTRING "SOFT.IRIS.DATA" diff --git a/src/fx/fx.hgr.star.a b/src/fx/fx.hgr.star.a index 4a17ee319..db4eaf510 100644 --- a/src/fx/fx.hgr.star.a +++ b/src/fx/fx.hgr.star.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.hgr.star.in.a b/src/fx/fx.hgr.star.in.a index d0bb60e06..48554c043 100644 --- a/src/fx/fx.hgr.star.in.a +++ b/src/fx/fx.hgr.star.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.hgr.star.ripple.a b/src/fx/fx.hgr.star.ripple.a index d4410a70b..7fb9bdba9 100644 --- a/src/fx/fx.hgr.star.ripple.a +++ b/src/fx/fx.hgr.star.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 12 - !text "FX/STAR.DATA" + +PSTRING "STAR.DATA" diff --git a/src/fx/fx.hgr.star7.a b/src/fx/fx.hgr.star7.a index 725e5bbe8..178407008 100644 --- a/src/fx/fx.hgr.star7.a +++ b/src/fx/fx.hgr.star7.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.hgr.star7.in.a b/src/fx/fx.hgr.star7.in.a index 5aad60c6d..0d0b050f4 100644 --- a/src/fx/fx.hgr.star7.in.a +++ b/src/fx/fx.hgr.star7.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.hgr.star7.ripple.a b/src/fx/fx.hgr.star7.ripple.a index 6cff8e5e7..169c20ee8 100644 --- a/src/fx/fx.hgr.star7.ripple.a +++ b/src/fx/fx.hgr.star7.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 13 - !text "FX/STAR7.DATA" + +PSTRING "STAR7.DATA" diff --git a/src/fx/fx.hgr.swirl.a b/src/fx/fx.hgr.swirl.a index 49410fe43..6b963cc61 100644 --- a/src/fx/fx.hgr.swirl.a +++ b/src/fx/fx.hgr.swirl.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_1BIT Coordinates1Bit CoordinatesFile - !byte 15 - !text "FX/CORNER4.DATA" + +PSTRING "CORNER4.DATA" diff --git a/src/fx/fx.hgr.wavy.iris.a b/src/fx/fx.hgr.wavy.iris.a index 8bcaed993..53de09cfe 100644 --- a/src/fx/fx.hgr.wavy.iris.a +++ b/src/fx/fx.hgr.wavy.iris.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.hgr.wavy.iris.bloom.a b/src/fx/fx.hgr.wavy.iris.bloom.a index 1a1fb1a58..7ac14a9e6 100644 --- a/src/fx/fx.hgr.wavy.iris.bloom.a +++ b/src/fx/fx.hgr.wavy.iris.bloom.a @@ -12,5 +12,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.hgr.wavy.iris.bloom.in.a b/src/fx/fx.hgr.wavy.iris.bloom.in.a index 5d8d97657..02436bf77 100644 --- a/src/fx/fx.hgr.wavy.iris.bloom.in.a +++ b/src/fx/fx.hgr.wavy.iris.bloom.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.hgr.wavy.iris.in.a b/src/fx/fx.hgr.wavy.iris.in.a index 80752ef5d..848e16ae6 100644 --- a/src/fx/fx.hgr.wavy.iris.in.a +++ b/src/fx/fx.hgr.wavy.iris.in.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.hgr.wavy.ripple.a b/src/fx/fx.hgr.wavy.ripple.a index 67640d3e1..fc2bd64b0 100644 --- a/src/fx/fx.hgr.wavy.ripple.a +++ b/src/fx/fx.hgr.wavy.ripple.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 17 - !text "FX/WAVY.IRIS.DATA" + +PSTRING "WAVY.IRIS.DATA" diff --git a/src/fx/fx.hgr.wavy.ripple.bloom.a b/src/fx/fx.hgr.wavy.ripple.bloom.a index 6e58880be..455c4d448 100644 --- a/src/fx/fx.hgr.wavy.ripple.bloom.a +++ b/src/fx/fx.hgr.wavy.ripple.bloom.a @@ -13,5 +13,4 @@ Start +FX_PRECOMPUTED_2BIT Coordinates2Bit CoordinatesFile - !byte 18 - !text "FX/W.IR.BLOOM.DATA" + +PSTRING "W.IR.BLOOM.DATA" diff --git a/src/fx/fx.shr.iris.a b/src/fx/fx.shr.iris.a index 46fd5935b..2b4572c3a 100644 --- a/src/fx/fx.shr.iris.a +++ b/src/fx/fx.shr.iris.a @@ -32,5 +32,4 @@ endzp } CoordinatesFile - !byte 16 - !text "FX/SHR.IRIS.DATA" + +PSTRING "SHR.IRIS.DATA" diff --git a/src/fx/fx.shr.iris.in.a b/src/fx/fx.shr.iris.in.a index eefc60ef2..927bf7bb9 100644 --- a/src/fx/fx.shr.iris.in.a +++ b/src/fx/fx.shr.iris.in.a @@ -33,5 +33,4 @@ endzp } CoordinatesFile - !byte 16 - !text "FX/SHR.IRIS.DATA" + +PSTRING "SHR.IRIS.DATA" diff --git a/src/fx/fx.shr.radial.a b/src/fx/fx.shr.radial.a index 080cab183..b870df354 100644 --- a/src/fx/fx.shr.radial.a +++ b/src/fx/fx.shr.radial.a @@ -122,5 +122,4 @@ endzp } CoordinatesFile - !byte 18 - !text "FX/SHR.RADIAL.DATA" + +PSTRING "SHR.RADIAL.DATA" diff --git a/src/fx/fx.shr.radial2.a b/src/fx/fx.shr.radial2.a index f19279457..efec89989 100644 --- a/src/fx/fx.shr.radial2.a +++ b/src/fx/fx.shr.radial2.a @@ -95,5 +95,4 @@ endzp } CoordinatesFile - !byte 18 - !text "FX/SHR.RADIAL.DATA" + +PSTRING "SHR.RADIAL.DATA" diff --git a/src/fx/fx.shr.ripple.a b/src/fx/fx.shr.ripple.a index 06391ec39..e5c95c576 100644 --- a/src/fx/fx.shr.ripple.a +++ b/src/fx/fx.shr.ripple.a @@ -32,5 +32,4 @@ endzp } CoordinatesFile - !byte 18 - !text "FX/SHR.RIPPLE.DATA" + +PSTRING "SHR.RIPPLE.DATA" diff --git a/src/fx/fx.shr.soft.iris.a b/src/fx/fx.shr.soft.iris.a index a5a35ead4..0ccb4a9d0 100644 --- a/src/fx/fx.shr.soft.iris.a +++ b/src/fx/fx.shr.soft.iris.a @@ -32,5 +32,4 @@ endzp } CoordinatesFile - !byte 18 - !text "FX/SHR.SFIRIS.DATA" + +PSTRING "SHR.SFIRIS.DATA" diff --git a/src/fx/fx.shr.soft.iris.in.a b/src/fx/fx.shr.soft.iris.in.a index 1ce2d12af..9fe0f2a26 100644 --- a/src/fx/fx.shr.soft.iris.in.a +++ b/src/fx/fx.shr.soft.iris.in.a @@ -33,5 +33,4 @@ endzp } CoordinatesFile - !byte 18 - !text "FX/SHR.SFIRIS.DATA" + +PSTRING "SHR.SFIRIS.DATA" diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index f918e4be5..ae86f8a9d 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 15631731 + !be24 15965732 !le16 5130 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index a12d9200f..a2f444a35 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 15576862 + !be24 15910412 !le16 5732 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 5ea6cd4fe..5f314af37 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 15508629 + !be24 15842179 !le16 4194 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 4e0a3bf5f..06e9929cd 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 15523343 + !be24 15856893 !le16 4652 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 05b3123d0..e3fb8db5b 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 15542058 + !be24 15875608 !le16 5621 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index d82c46cf8..1c30431ee 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 15563099 + !be24 15896649 !le16 6199 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 47e7588fa..9dd536da5 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 15636861 + !be24 15970862 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 54fe0f94b..020ab3f96 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 15637615 + !be24 15971616 !le16 449 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index dcb7f1ac0..86c786a0d 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 15638064 + !be24 15972065 !le16 303 diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a index 1c6904240..d1a36e803 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 12404847 + !be24 12738397 !le16 1652 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 689e3da5d..216087e0a 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 15585234 + !be24 15918784 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 4da787fdd..214220f28 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 15637347 + !be24 15971348 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index cb72bb5e6..9f434408a 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 15631672 + !be24 15965673 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 8b96ffa5d..6d789a9ad 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 15630092 + !be24 15964093 !le16 1426 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 83cde496f..b9c1e966d 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 15614858 + !be24 15948859 !le16 557 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 7a5a11ff8..b23c6cb4a 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 15582594 + !be24 15916144 !le16 2640 diff --git a/src/index/fxdata.idx.a b/src/index/fxdata.idx.a new file mode 100644 index 000000000..3df560c35 --- /dev/null +++ b/src/index/fxdata.idx.a @@ -0,0 +1,8 @@ +; +; Index record for build/FXDATA.IDX +; +; This file is automatically generated +; + !byte 0 + !be24 15920782 + !le16 451 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index f38913298..31a859daa 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 15587232 + !be24 15921233 !le16 7564 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index d6cb0fde3..27884c2df 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 15637271 + !be24 15971272 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 3205cef34..90185b26c 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 15631518 + !be24 15965519 !le16 154 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 549bfadb2..c86b0989b 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 15637414 + !be24 15971415 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 08e687095..aadb33ca4 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 15615415 + !be24 15949416 !le16 4334 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 2b6095c17..a80140a0c 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 15619749 + !be24 15953750 !le16 1733 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index d5f0eb280..304ba7f10 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 15621482 + !be24 15955483 !le16 1181 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 01960799f..c122bea65 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 15622663 + !be24 15956664 !le16 3394 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 2794486f8..0af578aae 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 15626057 + !be24 15960058 !le16 3429 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index e598add21..d8c5ebfe4 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 15629486 + !be24 15963487 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index c0f62f71f..9af576cfc 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 15629965 + !be24 15963966 !le16 127 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 876650133..22eddc5c5 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 15638367 + !be24 15972368 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 0e19f29bf..f9cafbd4e 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 15600201 + !be24 15934202 !le16 5083 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index acce526ef..0f1942cc6 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 15605284 + !be24 15939285 !le16 2485 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 61c39007f..00e21c8b1 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 15569298 + !be24 15902848 !le16 7564 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 5d2fc3294..25ca79cf2 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 15499046 + !be24 15832596 !le16 9583 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 7b704a877..8e71328bc 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 15512823 + !be24 15846373 !le16 10520 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index c7e0c9b3d..8d0e0196b 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 15527995 + !be24 15861545 !le16 14063 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index ca0c7eef4..14e03ab6e 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 15547679 + !be24 15881229 !le16 15420 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 314fee48c..0b57eb0fd 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 15586874 + !be24 15920424 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 7d985e6ad..358dd3674 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 15594796 + !be24 15928797 !le16 5405 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 005518649..a0f349c67 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 15607769 + !be24 15941770 !le16 7089 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 1b49cff85..ab2dff59a 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 15494698 + !be24 15828248 !le16 4348 diff --git a/src/macros.a b/src/macros.a index b772e994f..ae0b0f16e 100755 --- a/src/macros.a +++ b/src/macros.a @@ -7,6 +7,12 @@ !ifndef _MACROS_ { !source "src/constants.a" +!macro PSTRING .string { + !byte +-*-1 + !text .string ++ +} + ; for functions that take parameters on the stack ; set (PARAM) to point to the parameters and ; move the stack pointer to the first byte after the parameters diff --git a/src/prodos.path.a b/src/prodos.path.a index 12d72cbe2..34f5c5db5 100644 --- a/src/prodos.path.a +++ b/src/prodos.path.a @@ -88,6 +88,9 @@ kDFXIndexRecord kSFXIndexRecord !source "src/index/sfx.idx.a" +kFXDataIndexRecord + !source "src/index/fxdata.idx.a" + kGameHelpIndexRecord !source "src/index/gamehelp.idx.a" diff --git a/src/ui.attract.hgr.a b/src/ui.attract.hgr.a index 97e1ac83b..686955245 100644 --- a/src/ui.attract.hgr.a +++ b/src/ui.attract.hgr.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2018-2021 by 4am & qkumba +;(c) 2018-2024 by 4am & qkumba ; ; HGR title and action slideshows ; @@ -7,6 +7,7 @@ ; - HGRTitleSlideshow ; - HGRActionSlideshow ; - HGRSingle +; - LoadFXDATA ; ;------------------------------------------------------------------------------ @@ -54,6 +55,38 @@ HGRSingle jsr LoadHGRTransition ; load transition effect code at $6000 jmp ExecuteTransitionAt6000AndWait +;------------------------------------------------------------------------------ +; LoadFXDATA +; called indirectly (via iLoadFXDATA) by graphic effects modules +; to load large datafiles from the FXDATA index in TOTAL.DATA + +; in: A/Y contains address of filename +; X = high byte of load address +; out: all registers and flags clobbered +;------------------------------------------------------------------------------ +LoadFXDATA + +ST16 @filename + stx @okvsAddress+1 + stx @dataAddress+1 + + jsr LoadIndexedFile ; load FXDATA list +@okvsAddress + !word $FD00 ; SMC high byte + !word kFXDataIndexRecord + + jsr okvs_find ; find index record of this file in + !word @okvsAddress ; FXDATA list, by filename (passed in) +@filename + !word $FDFD ; SMC + +ST16 @indexRecordPtr + + jsr LoadIndexedFile ; load actual data file +@dataAddress + !word $FD00 ; SMC high byte +@indexRecordPtr + !word $FDFD ; SMC + rts + ;------------------------------------------------------------------------------ ; LoadHGRTransition [private] ; looks up name of next HGR transition effect in FX.CONF and loads that file