fix SHR effects that need to load large data files that are now stored in TOTAL.DATA instead of separate files

Makefile

@@ -135,7 +135,11 @@ 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 coordinates files loaded by graphic effects
+# note: these can not be padded because some of them are loaded into tight spaces near the unclobberable top of main memory
+#
+	[ -f build/index ] || ((for f in build/FX/*.DATA; do echo "$$(basename $$f)"; done) | bin/buildindexedfile.sh -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

src/fx/fx.shr.iris.a

@@ -9,7 +9,6 @@ mirror_rows = $106        ; $C8 bytes
 shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -19,7 +18,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          +SHR_STAGE_2 startzp, endzp
          rts
 

src/fx/fx.shr.iris.in.a

@@ -9,7 +9,6 @@ mirror_rows = $106        ; $C8 bytes
 shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -19,7 +18,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          +SHR_REVERSE coords
          +SHR_STAGE_2 startzp, endzp
          rts

src/fx/fx.shr.radial.a

@@ -10,7 +10,6 @@ shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
 last_coords = coords+$1F3E
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -20,7 +19,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          ;WRITEMAINMEM active
 
          lda   #$80

src/fx/fx.shr.radial2.a

@@ -10,7 +10,6 @@ shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
 last_coords = coords+$1F3E
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -20,7 +19,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          ;WRITEMAINMEM active
 
          lda   #$80

src/fx/fx.shr.ripple.a

@@ -9,7 +9,6 @@ mirror_rows = $106        ; $C8 bytes
 shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -19,7 +18,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          +SHR_STAGE_2 startzp, endzp
          rts
 

src/fx/fx.shr.soft.iris.a

@@ -9,7 +9,6 @@ mirror_rows = $106        ; $C8 bytes
 shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -19,7 +18,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          +SHR_STAGE_2 startzp, endzp
          rts
 

src/fx/fx.shr.soft.iris.in.a

@@ -9,7 +9,6 @@ mirror_rows = $106        ; $C8 bytes
 shrlo    = $200           ; $C8 bytes
 shrhi    = $300           ; $C8 bytes
 coords   = $9F00          ; $1F41 bytes
-CoordinatesFileCopy = $BE42; $11 bytes
 shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during construction
 
          !source "src/fx/macros.a"
@@ -19,7 +18,7 @@ shr_mirror_cols = $BE60   ; $A0 bytes but clobbers $27 previous bytes during con
 
 !pseudopc *-$300 {
 stage2
-         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile, CoordinatesFileCopy
+         +LOAD_SHR_COORDINATES_AT coords, CoordinatesFile
          +SHR_REVERSE coords
          +SHR_STAGE_2 startzp, endzp
          rts

src/fx/macros.shr.a

@@ -104,17 +104,12 @@
          bne   -
 }
 
-!macro LOAD_SHR_COORDINATES_AT .coords, .filename, .scratch {
+!macro LOAD_SHR_COORDINATES_AT .coords, .filename {
 ; out:   WRITEMAINMEM active
 ;        LC RAM2 active and read/write
-         ldx   .filename             ; LOAD_FILE_AT macro destroys pathname
+         +LDADDR .filename
--        lda   .filename, x          ; so we need to make a copy
+         ldx   #>.coords
-         sta   .scratch, x
+         jsr   iLoadFXDATA
-         dex
-         bpl   -
-
-         +READ_RAM2_WRITE_RAM2
-         +LOAD_FILE_AT .scratch, .coords
 }
 
 !macro SHR_STAGE_1 .shrlo, .shrhi, .mirror_rows, .mirror_cols {

src/index/artwork.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15910273
+         !be24  15909993
          !le16     5130

src/index/attract.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15854953
+         !be24  15854673
          !le16     5732

src/index/cache00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15786720
+         !be24  15786440
          !le16     4194

src/index/cache01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15801434
+         !be24  15801154
          !le16     4652

src/index/cache10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15820149
+         !be24  15819869
          !le16     5621

src/index/cache11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15841190
+         !be24  15840910
          !le16     6199

src/index/coverfade.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15915403
+         !be24  15915123
          !le16      410

src/index/credits.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15916157
+         !be24  15915877
          !le16      449

src/index/decrunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15916606
+         !be24  15916326
          !le16      303

src/index/demo.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  12682938
+         !be24  12682658
          !le16     1652

src/index/dfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15863325
+         !be24  15863045
          !le16     1640

src/index/dgr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15915889
+         !be24  15915609
          !le16       67

src/index/dgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15910214
+         !be24  15909934
          !le16       59

src/index/dhgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15908634
+         !be24  15908354
          !le16     1426

src/index/dtitle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15893400
+         !be24  15893120
          !le16      557

src/index/fx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15860685
+         !be24  15860405
          !le16     2640

src/index/fxdata.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15865323
+         !be24  15865043
          !le16      451

src/index/gamehelp.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15865774
+         !be24  15865494
          !le16     7564

src/index/gr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15915813
+         !be24  15915533
          !le16       76

src/index/gr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15910060
+         !be24  15909780
          !le16      154

src/index/helptext.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15915956
+         !be24  15915676
          !le16      201

src/index/hgr0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15893957
+         !be24  15893677
          !le16     4334

src/index/hgr1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15898291
+         !be24  15898011
          !le16     1733

src/index/hgr2.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15900024
+         !be24  15899744
          !le16     1181

src/index/hgr3.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15901205
+         !be24  15900925
          !le16     3394

src/index/hgr4.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15904599
+         !be24  15904319
          !le16     3429

src/index/hgr5.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15908028
+         !be24  15907748
          !le16      479

src/index/hgr6.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15908507
+         !be24  15908227
          !le16      127

src/index/joystick.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15916909
+         !be24  15916629
          !le16     2370

src/index/miniattract0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15878743
+         !be24  15878463
          !le16     5083

src/index/miniattract1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15883826
+         !be24  15883546
          !le16     2485

src/index/prelaunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15847389
+         !be24  15847109
          !le16     7564

src/index/search00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15777137
+         !be24  15776857
          !le16     9583

src/index/search01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15790914
+         !be24  15790634
          !le16    10520

src/index/search10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15806086
+         !be24  15805806
          !le16    14063

src/index/search11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15825770
+         !be24  15825490
          !le16    15420

src/index/sfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15864965
+         !be24  15864685
          !le16      358

src/index/slideshow.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15873338
+         !be24  15873058
          !le16     5405

src/index/title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15886311
+         !be24  15886031
          !le16     7089

src/index/xsingle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15772789
+         !be24  15772509
          !le16     4348