From e77962783202f9d25244ae20f9df53c1a52dcea9 Mon Sep 17 00:00:00 2001 From: frankmilliron <34376619+frankmilliron@users.noreply.github.com> Date: Tue, 20 Dec 2022 09:44:28 -0800 Subject: [PATCH] sync FX These were fixed recently in 4cade. --- src/fx/fx.hgr.crystal.a | 3 +++ src/fx/fx.hgr.dither.radial.common.a | 2 +- src/fx/fx.hgr.foursquare.white.a | 3 +++ src/fx/fx.hgr.onesquare.white.a | 3 +++ src/fx/fx.hgr.radial.common.a | 2 +- src/fx/fx.hgr.radial3.a | 2 +- src/fx/fx.hgr.star.bloom.a | 3 +++ 7 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/fx/fx.hgr.crystal.a b/src/fx/fx.hgr.crystal.a index 74e61df..db6e171 100644 --- a/src/fx/fx.hgr.crystal.a +++ b/src/fx/fx.hgr.crystal.a @@ -144,4 +144,7 @@ !source "src/wait.a" +HGR_WHITE_ROUTINES +HGR_BLOCK_COPY_ROUTINES +!if * and 1 { + !byte 0 +} Coordinates diff --git a/src/fx/fx.hgr.dither.radial.common.a b/src/fx/fx.hgr.dither.radial.common.a index ef31fdb..31b788b 100644 --- a/src/fx/fx.hgr.dither.radial.common.a +++ b/src/fx/fx.hgr.dither.radial.common.a @@ -17,7 +17,7 @@ input = $FE ; word +BUILD_DITHER_MASKS dithermasks +BUILD_MIRROR_COLS mirror_cols - +BUILD_HGR_LOOKUP_TABLES_X_IS_ALREADY_0 hgrlo, hgr1hi + +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi +BUILD_HGR_MIRROR_LOOKUP_TABLES hgrlomirror, hgr1himirror +BUILD_SPARSE_BITMASKS_1BIT diff --git a/src/fx/fx.hgr.foursquare.white.a b/src/fx/fx.hgr.foursquare.white.a index 034e52c..4aa9eec 100644 --- a/src/fx/fx.hgr.foursquare.white.a +++ b/src/fx/fx.hgr.foursquare.white.a @@ -163,4 +163,7 @@ stainc sta ($FE), y +HGR_BLOCK_COPY_ROUTINES !byte $80,$80 +!if * and 1 { + !byte 0 +} Coordinates diff --git a/src/fx/fx.hgr.onesquare.white.a b/src/fx/fx.hgr.onesquare.white.a index 7fd67ef..0c71e47 100644 --- a/src/fx/fx.hgr.onesquare.white.a +++ b/src/fx/fx.hgr.onesquare.white.a @@ -145,4 +145,7 @@ +HGR_BLOCK_COPY_ROUTINES !byte $80,$80 +!if * and 1 { + !byte 0 +} Coordinates diff --git a/src/fx/fx.hgr.radial.common.a b/src/fx/fx.hgr.radial.common.a index 06facf3..540bb58 100644 --- a/src/fx/fx.hgr.radial.common.a +++ b/src/fx/fx.hgr.radial.common.a @@ -14,7 +14,7 @@ reverse_input = $FC ; word input = $FE ; word +BUILD_MIRROR_COLS mirror_cols - +BUILD_HGR_LOOKUP_TABLES_X_IS_ALREADY_0 hgrlo, hgr1hi + +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi +BUILD_HGR_MIRROR_LOOKUP_TABLES hgrlomirror, hgr1himirror +BUILD_SPARSE_BITMASKS_1BIT diff --git a/src/fx/fx.hgr.radial3.a b/src/fx/fx.hgr.radial3.a index faa66f4..737b0ca 100644 --- a/src/fx/fx.hgr.radial3.a +++ b/src/fx/fx.hgr.radial3.a @@ -22,7 +22,7 @@ input = $FE ; word Start +BUILD_MIRROR_COLS mirror_cols - +BUILD_HGR_LOOKUP_TABLES_X_IS_ALREADY_0 hgrlo, hgr1hi + +BUILD_HGR_LOOKUP_TABLES hgrlo, hgr1hi +BUILD_HGR_MIRROR_LOOKUP_TABLES hgrlomirror, hgr1himirror +BUILD_SPARSE_BITMASKS_1BIT +LDADDR Coordinates1Bit diff --git a/src/fx/fx.hgr.star.bloom.a b/src/fx/fx.hgr.star.bloom.a index 0eefc7c..73b4a5e 100644 --- a/src/fx/fx.hgr.star.bloom.a +++ b/src/fx/fx.hgr.star.bloom.a @@ -9,6 +9,9 @@ +FX_PRECOMPUTED_2BIT Coordinates +!if * and 1 { + !byte 0 +} Coordinates !source "src/fx/fx.hgr.star.bloom.data.a" !byte $00