From f3ac2d62bb1057965eb528c46b59d3d81b117618 Mon Sep 17 00:00:00 2001 From: 4am Date: Sun, 15 Nov 2020 00:37:38 -0500 Subject: [PATCH] include EOF marker in 1-bit external files --- src/fx/fx.hgr.bubbles.data.a | 1 + src/fx/fx.hgr.corner4.data.a | 1 + src/fx/fx.hgr.iris.data.a | 1 + src/fx/fx.hgr.precomputed.1bit.a | 5 +++-- src/fx/fx.hgr.radial.a | 1 + src/fx/fx.hgr.radial.data.a | 1 + src/fx/fx.hgr.radial3.a | 4 +--- src/fx/fx.hgr.slow.star.data.a | 1 + src/fx/fx.hgr.snowflake.data.a | 1 + 9 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/fx/fx.hgr.bubbles.data.a b/src/fx/fx.hgr.bubbles.data.a index 8084bd1e0..898d66341 100644 --- a/src/fx/fx.hgr.bubbles.data.a +++ b/src/fx/fx.hgr.bubbles.data.a @@ -6721,3 +6721,4 @@ !byte $18,%00001111 !byte $48,%00001010 !byte $48,%00000101 + !byte $80 diff --git a/src/fx/fx.hgr.corner4.data.a b/src/fx/fx.hgr.corner4.data.a index 8d3650ebd..01c9698ab 100644 --- a/src/fx/fx.hgr.corner4.data.a +++ b/src/fx/fx.hgr.corner4.data.a @@ -6721,3 +6721,4 @@ !byte $01,%01000000 !byte $01,%00000000 !byte $01,%00100000 + !byte $80 diff --git a/src/fx/fx.hgr.iris.data.a b/src/fx/fx.hgr.iris.data.a index 0d599b3e0..7f6f29303 100644 --- a/src/fx/fx.hgr.iris.data.a +++ b/src/fx/fx.hgr.iris.data.a @@ -6721,3 +6721,4 @@ !byte $00,%01000000 !byte $00,%00100000 !byte $00,%00000000 + !byte $80 diff --git a/src/fx/fx.hgr.precomputed.1bit.a b/src/fx/fx.hgr.precomputed.1bit.a index 42ea84ae3..87785b770 100644 --- a/src/fx/fx.hgr.precomputed.1bit.a +++ b/src/fx/fx.hgr.precomputed.1bit.a @@ -130,8 +130,9 @@ InitOnce +READ_RAM2_WRITE_RAM2 +LOAD_FILE_AT .CoordinatesFile, Coordinates1Bit +READ_RAM1_WRITE_RAM1 - lda #$80 - sta EndCoordinates1Bit + ; data file must contain this EOF marker + ;lda #$80 + ;sta EndCoordinates1Bit } !macro FX_REVERSE_1BIT { diff --git a/src/fx/fx.hgr.radial.a b/src/fx/fx.hgr.radial.a index a8be78c50..aaaa8b395 100644 --- a/src/fx/fx.hgr.radial.a +++ b/src/fx/fx.hgr.radial.a @@ -18,6 +18,7 @@ input = $FE ; word !source "src/fx/fx.hgr.precomputed.1bit.a" +FX_INITONCE_1BIT CoordinatesFile, Start + lda #$80 sta Coordinates1Bit-2 Start diff --git a/src/fx/fx.hgr.radial.data.a b/src/fx/fx.hgr.radial.data.a index 4d2bcbe7b..0cee7c38c 100644 --- a/src/fx/fx.hgr.radial.data.a +++ b/src/fx/fx.hgr.radial.data.a @@ -6721,3 +6721,4 @@ !byte $04,%11010011 !byte $02,%11010011 !byte $00,%11010011 + !byte $80 diff --git a/src/fx/fx.hgr.radial3.a b/src/fx/fx.hgr.radial3.a index 785756e5e..66bac9e01 100644 --- a/src/fx/fx.hgr.radial3.a +++ b/src/fx/fx.hgr.radial3.a @@ -29,7 +29,7 @@ Start +ST16 input +LDADDR EndCoordinates1Bit-2 +ST16 reverse_input - jmp Loop + +HIDE_NEXT_BYTE Exit rts Loop ldy #0 lda (input),y @@ -89,5 +89,3 @@ Loop ldy #0 CoordinatesFile !byte 14 !text "FX/RADIAL.DATA" -Coordinates=Coordinates1Bit -EndCoordinates=EndCoordinates1Bit diff --git a/src/fx/fx.hgr.slow.star.data.a b/src/fx/fx.hgr.slow.star.data.a index e510a7b95..b973e117c 100644 --- a/src/fx/fx.hgr.slow.star.data.a +++ b/src/fx/fx.hgr.slow.star.data.a @@ -6721,3 +6721,4 @@ !byte $1A,%00000000 !byte $1E,%00000000 !byte $1C,%00000000 + !byte $80 diff --git a/src/fx/fx.hgr.snowflake.data.a b/src/fx/fx.hgr.snowflake.data.a index 5086b77e7..c6c43926e 100644 --- a/src/fx/fx.hgr.snowflake.data.a +++ b/src/fx/fx.hgr.snowflake.data.a @@ -6721,3 +6721,4 @@ !byte $5E,%01000000 !byte $5E,%00100000 !byte $5E,%00000000 + !byte $80