diff --git a/Makefile b/Makefile index 31df44cb6..fc67c0a20 100644 --- a/Makefile +++ b/Makefile @@ -33,21 +33,21 @@ dsk: md asm bin/padto.sh 512 build/PREFS.CONF >>build/log for f in res/TITLE res/COVER res/HELP res/GAMES.CONF res/ATTRACT.CONF res/FX.CONF res/DFX.CONF build/PREFS.CONF res/CREDITS res/HELPTEXT res/DECRUNCH res/JOYSTICK res/Finder.Data res/Finder.Root; do $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; done bin/buildfileinfo.sh res/TITLE.HGR "06" "4000" >>build/log -# bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log -# bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log -# bin/buildfileinfo.sh res/ACTION.DHGR "06" "3FF8" >>build/log -# bin/buildfileinfo.sh res/ACTION.GR "06" "6000" >>build/log -# bin/buildfileinfo.sh res/ARTWORK.SHR "06" "1FF8" >>build/log -# bin/buildfileinfo.sh res/ATTRACT "04" "8000" >>build/log + bin/buildfileinfo.sh res/TITLE.DHGR "06" "4000" >>build/log + bin/buildfileinfo.sh res/ACTION.HGR "06" "3FF8" >>build/log + bin/buildfileinfo.sh res/ACTION.DHGR "06" "3FF8" >>build/log + bin/buildfileinfo.sh res/ACTION.GR "06" "6000" >>build/log + bin/buildfileinfo.sh res/ARTWORK.SHR "06" "1FF8" >>build/log + bin/buildfileinfo.sh res/ATTRACT "04" "8000" >>build/log bin/buildfileinfo.sh res/SS "04" "4000" >>build/log -# bin/buildfileinfo.sh res/ICONS "CA" "0000" >>build/log + bin/buildfileinfo.sh res/ICONS "CA" "0000" >>build/log for f in res/TITLE.* res/ACTION.* res/ARTWORK.* res/ATTRACT res/SS res/DEMO res/TITLE.ANIMATED res/ICONS; do $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" >>build/log; done for i in 1 2 3 4 5 6; do $(CADIUS) RENAMEFILE build/"$(DISK)" "/$(VOLUME)/DEMO/SPCARTOON.$${i}$${i}" "SPCARTOON.$${i}." >>build/log; done $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/FX" "build/FX" >>build/log -# for f in res/dsk/*.po; do $(CADIUS) EXTRACTVOLUME "$${f}" build/X/ >> build/log; done -# rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* -# $(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" >>build/log -# for f in build/X/*; do $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f"; done >>build/log + for f in res/dsk/*.po; do $(CADIUS) EXTRACTVOLUME "$${f}" build/X/ >> build/log; done + rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* + $(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" >>build/log + for f in build/X/*; do $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f"; done >>build/log bin/buildfileinfo.sh build/PRELAUNCH "06" "0106" >>build/log $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/PRELAUNCH" "build/PRELAUNCH" >>build/log rsync -aP --exclude=STANDARD res/GAMEHELP build/ >>build/log diff --git a/bin/V2Make.scpt b/bin/V2Make.scpt index d4b1bb086..955b91c34 100644 Binary files a/bin/V2Make.scpt and b/bin/V2Make.scpt differ diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF index d12e997e4..238744727 100644 --- a/res/ATTRACT.CONF +++ b/res/ATTRACT.CONF @@ -1,6 +1,3 @@ -FAVORITES2.CONF=1 -FAVORITES2.CONF=1 - # set 1 FAVORITES2.CONF=1 ACTIONHIJ1.CONF=2 diff --git a/res/FX.CONF b/res/FX.CONF index c0ce12280..3e81e2d92 100644 --- a/res/FX.CONF +++ b/res/FX.CONF @@ -1,6 +1,3 @@ -BOXES48 -BOXES48 - RIPPLE STAR.IN SOFT.DIAGONAL diff --git a/src/fx/fx.hgr.48boxes.common.a b/src/fx/fx.hgr.48boxes.common.a index 3b9db1464..dbaeb3ccd 100644 --- a/src/fx/fx.hgr.48boxes.common.a +++ b/src/fx/fx.hgr.48boxes.common.a @@ -194,7 +194,6 @@ k_right_mask = 17 MainLoop ldx #48 BoxLoop stx box ldy BoxStages-1, x ; for each box, get its current stage - inc BoxStages-1, x ; increment every box's stage every time through the loop lda StagesHi, y beq NextBox ; if stage's drawing routine is 0, nothing to do sta j+2 @@ -205,7 +204,9 @@ BoxLoop stx box clc j jsr $FD00 ; [SMC] call drawing routine for this stage ldx box -NextBox dex +NextBox inc BoxStages-1, x ; increment every box's stage every time through the loop, + ; even if we didn't call a drawing routine + dex bne BoxLoop lda any beq + ; if we didn't draw anything in any box, we're done