From 021c06725ae501fa8355cf0497729a66fee507c6 Mon Sep 17 00:00:00 2001 From: 4am Date: Sun, 2 Jun 2024 21:17:51 -0400 Subject: [PATCH] move CoordinatesFile pstring to SHR stage 2 so it doesn't get clobbered by FXDATA index --- src/fx/fx.shr.iris.a | 7 ++++--- src/fx/fx.shr.iris.in.a | 7 ++++--- src/fx/fx.shr.radial.a | 7 ++++--- src/fx/fx.shr.radial2.a | 7 ++++--- src/fx/fx.shr.ripple.a | 7 ++++--- src/fx/fx.shr.soft.iris.a | 7 ++++--- src/fx/fx.shr.soft.iris.in.a | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/fx/fx.shr.iris.a b/src/fx/fx.shr.iris.a index aae65b04c..0d2ad7dfb 100644 --- a/src/fx/fx.shr.iris.a +++ b/src/fx/fx.shr.iris.a @@ -22,13 +22,14 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.IRIS.DATA" + startzp !pseudopc 0 { stage3 +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, shr_mirror_cols } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.IRIS.DATA" diff --git a/src/fx/fx.shr.iris.in.a b/src/fx/fx.shr.iris.in.a index f311baaa7..26fe41907 100644 --- a/src/fx/fx.shr.iris.in.a +++ b/src/fx/fx.shr.iris.in.a @@ -23,13 +23,14 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.IRIS.DATA" + startzp !pseudopc 0 { stage3 +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, shr_mirror_cols } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.IRIS.DATA" diff --git a/src/fx/fx.shr.radial.a b/src/fx/fx.shr.radial.a index 3ad1353a8..510bebb1e 100644 --- a/src/fx/fx.shr.radial.a +++ b/src/fx/fx.shr.radial.a @@ -28,6 +28,9 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.RADIAL.DATA" + startzp !pseudopc 0 { ; bottom-left quadrant (opposite row, original column, reverse input order) @@ -118,7 +121,5 @@ src2 lda $FD00, y ; SMC high byte exit rts } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.RADIAL.DATA" diff --git a/src/fx/fx.shr.radial2.a b/src/fx/fx.shr.radial2.a index b569a9eb0..2f2121642 100644 --- a/src/fx/fx.shr.radial2.a +++ b/src/fx/fx.shr.radial2.a @@ -28,6 +28,9 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.RADIAL.DATA" + startzp !pseudopc 0 { ; top-left quadrant (original row, original column, original input order) @@ -91,7 +94,5 @@ src2 lda $FD00, y ; SMC high byte exit rts } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.RADIAL.DATA" diff --git a/src/fx/fx.shr.ripple.a b/src/fx/fx.shr.ripple.a index 3a098937a..4524f2f7f 100644 --- a/src/fx/fx.shr.ripple.a +++ b/src/fx/fx.shr.ripple.a @@ -22,13 +22,14 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.RIPPLE.DATA" + startzp !pseudopc 0 { stage3 +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, shr_mirror_cols } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.RIPPLE.DATA" diff --git a/src/fx/fx.shr.soft.iris.a b/src/fx/fx.shr.soft.iris.a index 1f86a3126..bac869ee2 100644 --- a/src/fx/fx.shr.soft.iris.a +++ b/src/fx/fx.shr.soft.iris.a @@ -22,13 +22,14 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.SFIRIS.DATA" + startzp !pseudopc 0 { stage3 +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, shr_mirror_cols } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +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 a6f057a1d..df56a3bf3 100644 --- a/src/fx/fx.shr.soft.iris.in.a +++ b/src/fx/fx.shr.soft.iris.in.a @@ -23,13 +23,14 @@ stage2 +SHR_STAGE_2 startzp, endzp rts +CoordinatesFile + +PSTRING "SHR.SFIRIS.DATA" + startzp !pseudopc 0 { stage3 +SHR_STAGE_3 coords, shrlo, shrhi, mirror_rows, shr_mirror_cols } endzp +!if (* - stage2 > $200) { !serious "Stage2 code is too large" } } - -CoordinatesFile - +PSTRING "SHR.SFIRIS.DATA"