fix Run For The Money reset vector

fix Death Sword reset vector
fix Colorix reset vector
2024-06-11 14:29:35 +00:00 · 2024-05-11 14:38:36 -07:00 · 2024-05-11 14:38:23 -07:00 · 2024-05-11 14:38:06 -07:00 · 2024-05-11 10:55:14 -04:00 · 2024-05-11 10:36:50 -04:00
95 changed files with 124 additions and 152 deletions
--- a/47
+++ b/47
@ -59,20 +59,33 @@ dsk: index asmproboot asmlauncher extract
 		res/TITLE.ANIMATED \
 		res/ICONS \
 		build/FX \
-		build/PRELAUNCH; do \
+		build/PRELAUNCH \
+		build/X; do \
            rm -f "$$f"/.DS_Store; \
            $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" -C >>build/log; \
        done
-	$(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" -C >>build/log
-	for f in build/X/*; do \
-	    $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f" -C >>build/log; \
-	done
 	bin/changebootloader.sh build/"$(DISK)" build/proboothd

-extract: preconditions md
+gamesconf: preconditions md
+#
+# create a version of GAMES.CONF without comments or blank lines or anything after display titles
+#
+	[ -f build/index ] || (awk '!/^$$|^#/' < res/GAMES.CONF | awk -F'/' '{ print $$1 }' > build/GAMES.CONF)
+#
+# create a list of all game filenames, without metadata or display names, sorted by game filename
+#
+	[ -f build/index ] || (awk -F, '/,/ { print $$2 }' < build/GAMES.CONF | awk -F= '{ print $$1 }' | sort > build/GAMES.SORTED)
+
+extract: preconditions md gamesconf
 	$(PARALLEL) '$(CADIUS) EXTRACTVOLUME {} build/X/ >>build/log' ::: res/dsk/*.po
-	rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM*
-	for f in $$(grep '^....1' res/GAMES.CONF | awk '!/^$$|^#/' | awk -F, '/,/ { print $$2 }' | awk -F= '{ print $$1 }'); do mv build/X/"$$(basename $$f)"/"$$(basename $$f)"* build/X.INDEXED/; rm -rf build/X/"$$(basename $$f)"; done
+	rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* build/X/**/_FileInformation.txt
+	for f in $$(grep '^....1' build/GAMES.CONF | awk '!/^$$|^#/' | awk -F, '/,/ { print $$2 }' | awk -F= '{ print $$1 }'); do mv build/X/"$$(basename $$f)"/"$$(basename $$f)"* build/X.INDEXED/; rm -rf build/X/"$$(basename $$f)"; done
+	for d in build/X/*; do \
+		for f in "$$d"/*; do \
+			mv "$$f" build/X/"$$(basename $$f)"; \
+		done; \
+		rmdir "$$d"; \
+	done
 	(for f in build/X.INDEXED/*; do echo "$$(basename $$f)"; done) | bin/buildindexedfile.sh -a -p build/TOTAL.DATA build/X.INDEXED > build/XSINGLE.IDX

 index: preconditions md asmfx asmprelaunch asmdemo compress extract
@ -88,14 +101,6 @@ index: preconditions md asmfx asmprelaunch asmdemo compress extract
 	[ -f build/index ] || (bin/converthelp.sh res/CREDITS build/CREDITS)
 	[ -f build/index ] || $(PARALLEL) 'bin/converthelp.sh "{}" "build/GAMEHELP/{/}"' ::: res/GAMEHELP/*
 #
-# create a version of GAMES.CONF without comments or blank lines
-#
-	[ -f build/index ] || (awk '!/^$$|^#/' < res/GAMES.CONF > build/GAMES.CONF)
-#
-# create a list of all game filenames, without metadata or display names, sorted by game filename
-#
-	[ -f build/index ] || (awk -F, '/,/ { print $$2 }' < build/GAMES.CONF | awk -F= '{ print $$1 }' | sort > build/GAMES.SORTED)
-#
 # precompute indexed files for prelaunch
 # note: prelaunch must be first in TOTAL.DATA due to a hack in LoadStandardPrelaunch
 # note 2: these can not be padded because they are loaded at $0106 and padding would clobber the stack
@ -254,12 +259,12 @@ attract: compress
 	bin/check-attract-mode.sh
 	bin/generate-mini-attract-mode.sh

-cache: preconditions md
+cache: preconditions md gamesconf
 	$(PARALLEL) ::: \
-	    'awk -F= '"'"'/^00/ { print $$2 }'"'"' < res/GAMES.CONF | bin/buildcache.py > build/cache00.a' \
-	    'awk -F= '"'"'/^0/ { print $$2 }'"'"' < res/GAMES.CONF | bin/buildcache.py > build/cache01.a' \
-	    'awk -F= '"'"'/^.0/ { print $$2 }'"'"' < res/GAMES.CONF | bin/buildcache.py > build/cache10.a' \
-	    'awk -F= '"'"'!/^$$|^#|^\[/ { print $$2 }'"'"' < res/GAMES.CONF | bin/buildcache.py > build/cache11.a'
+	    'awk -F= '"'"'/^00/ { print $$2 }'"'"' < build/GAMES.CONF | bin/buildcache.py > build/cache00.a' \
+	    'awk -F= '"'"'/^0/ { print $$2 }'"'"' < build/GAMES.CONF | bin/buildcache.py > build/cache01.a' \
+	    'awk -F= '"'"'/^.0/ { print $$2 }'"'"' < build/GAMES.CONF | bin/buildcache.py > build/cache10.a' \
+	    'awk -F= '"'"'!/^$$|^#|^\[/ { print $$2 }'"'"' < build/GAMES.CONF | bin/buildcache.py > build/cache11.a'
 	$(PARALLEL) ::: \
 	    '$(ACME) -o res/CACHE00.IDX build/cache00.a' \
 	    '$(ACME) -o res/CACHE01.IDX build/cache01.a' \
--- a/res/ACTION.HGR.UNCOMPRESSED/SL
+++ b/res/ACTION.HGR.UNCOMPRESSED/SL
--- a/res/ACTION.HGR/SL
+++ b/res/ACTION.HGR/SL
--- a/res/ARTWORK.SHR.SCORES/SL
+++ b/res/ARTWORK.SHR.SCORES/SL
--- a/res/ARTWORK.SHR.UNCOMPRESSED/SL
+++ b/res/ARTWORK.SHR.UNCOMPRESSED/SL
--- a/res/ARTWORK.SHR/SL
+++ b/res/ARTWORK.SHR/SL
--- a/res/ATTRACT/SL
+++ b/res/ATTRACT/SL
@ -1,11 +1,11 @@
 #
-# Attract mode for SC
+# Attract mode for SL
 # This file is automatically generated
 #

-SC=C
-SC=A
+SL=C
 SITUATION.CRTC2=A
 SITUATION.CRTC3=A
+SL=A

 [eof]
--- a/res/SS/ACTIONS1.CONF
+++ b/res/SS/ACTIONS1.CONF
@ -12,6 +12,6 @@ SHAMUS
 SEA.DRAGON3=SEA.DRAGON
 STAR.CLONES
 SHORT.CIRCUIT
-SITUATION.CRTC2=SC
+SITUATION.CRTC2=SL

 [eof]
--- a/res/SS/ACTIONS2.CONF
+++ b/res/SS/ACTIONS2.CONF
@ -6,7 +6,7 @@ SKYFOX
 SHORT.CIRCUIT2=SHORT.CIRCUIT
 STARGATE2=STARGATE
 SPACE.EGGS
-SITUATION.CRTC3=SC
+SITUATION.CRTC3=SL
 SPUTNIK.ATTACK2=SPUTNIK.ATTACK
 SIGMA.SEVEN
 STAR.MAZE
--- a/res/SS/ACTIONS4.CONF
+++ b/res/SS/ACTIONS4.CONF
@ -2,7 +2,7 @@
 # action shots slideshow of games that begin with "S"
 #

-SC
+SL
 STAR.BLAZER2=STAR.BLAZER
 SKYFOX3=SKYFOX
 STAR.DANCE
--- a/res/SS/FAVORITES5.CONF
+++ b/res/SS/FAVORITES5.CONF
@ -4,7 +4,7 @@

 CONAN
 NM
-SC
+SL
 SPECTRE
 SABOTAGE
 DINO.EGGS
--- a/res/SS/OTHER1.CONF
+++ b/res/SS/OTHER1.CONF
@ -2,7 +2,7 @@
 # slideshow of titles not in other company-specific slideshows
 #

-SC
+SL
 EARLY.BIRD
 GUARDIAN
 BH
--- a/res/SS/S3.CONF
+++ b/res/SS/S3.CONF
@ -6,7 +6,7 @@ SAMMY.LIGHTFOOT
 SPACE.WARRIOR
 SPACE.KADET
 SNOGGLE
-SC
+SL
 S2
 SPACE.SPIKES
 SEAFOX
--- a/res/SS/SHR1.CONF
+++ b/res/SS/SHR1.CONF
@ -2,7 +2,7 @@
 # super hi-res slideshow
 #

-SC
+SL
 CANYON.CLIMBER
 MC
 LANCASTER
--- a/src/demo/aquatron.a
+++ b/src/demo/aquatron.a
@ -44,7 +44,7 @@ aquatron
         !byte aquatron_e-aquatron_b
 aquatron_b
 aquatron_dir_b
-         !text "X/AQUATRON"
+         !text "X"
 aquatron_dir_e
         !text "/AQUATRON"
 aquatron_e
--- a/src/demo/beer.run.a
+++ b/src/demo/beer.run.a
@ -48,7 +48,7 @@ beer_run
         !byte beer_run_e-beer_run_b
 beer_run_b
 beer_run_dir_b
-         !text "X/BEER.RUN"
+         !text "X"
 beer_run_dir_e
         !text "/BEER.RUN"
 beer_run_e
--- a/src/demo/borg.a
+++ b/src/demo/borg.a
@ -42,7 +42,7 @@ patch2   !byte $4C,$00,$01
 borg     !byte borg_e-borg_b
 borg_b
 borg_dir_b
-         !text "X/BORG"
+         !text "X"
 borg_dir_e
         !text "/BORG"
 borg_e
--- a/src/demo/bouncing.kmngas.a
+++ b/src/demo/bouncing.kmngas.a
@ -55,7 +55,7 @@ patch    !byte $4C,$00,$01
 kamungas !byte kamungas_e-kamungas_b
 kamungas_b
 kamungas_dir_b
-         !text "X/BK"
+         !text "X"
 kamungas_dir_e
         !text "/BK"
 kamungas_e
--- a/src/demo/championship.lode.runner.a
+++ b/src/demo/championship.lode.runner.a
@ -38,7 +38,7 @@ champ_lode
         !byte champ_lode_e-champ_lode_b
 champ_lode_b
 champ_lode_dir_b
-         !text "X/CL"
+         !text "X"
 champ_lode_dir_e
         !text "/CL"
 champ_lode_e
--- a/src/demo/cider.spider.a
+++ b/src/demo/cider.spider.a
@ -37,7 +37,7 @@ cider_spider
         !byte cider_spider_e-cider_spider_b
 cider_spider_b
 cider_spider_dir_b
-         !text "X/AC"
+         !text "X"
 cider_spider_dir_e
         !text "/AC"
 cider_spider_e
--- a/src/demo/conan.a
+++ b/src/demo/conan.a
@ -59,7 +59,7 @@ conan
         !byte conan_e-conan_b
 conan_b
 conan_dir_b
-         !text "X/CONAN"
+         !text "X"
 conan_dir_e
         !text "/CONAN"
 conan_e
--- a/src/demo/crime.wave.a
+++ b/src/demo/crime.wave.a
@ -31,7 +31,7 @@ crime_wave
         !byte crime_wave_e-crime_wave_b
 crime_wave_b
 crime_wave_dir_b
-         !text "X/CRIME.WAVE"
+         !text "X"
 crime_wave_dir_e
         !text "/CRIME.WAVE"
 crime_wave_e
--- a/src/demo/dino.eggs.a
+++ b/src/demo/dino.eggs.a
@ -34,7 +34,7 @@ dino_eggs
         !byte dino_eggs_e-dino_eggs_b
 dino_eggs_b
 dino_eggs_dir_b
-         !text "X/DINO.EGGS"
+         !text "X"
 dino_eggs_dir_e
         !text "/DINO.EGGS"
 dino_eggs_e
--- a/src/demo/firebug.a
+++ b/src/demo/firebug.a
@ -44,7 +44,7 @@
 patch    !byte $4C,$00,$01

 title    !byte x_e-x_b
-x_b      !text "X/FIREBUG/FIREBUG"
+x_b      !text "X/FIREBUG"
 x_e

 !if * > $3F0 {
--- a/src/demo/gumball.a
+++ b/src/demo/gumball.a
@ -68,7 +68,7 @@ patch5   !byte $4C,<callback2,>callback2
 gumball  !byte gumball_e-gumball_b
 gumball_b
 gumball_dir_b
-         !text "X/GUMBALL"
+         !text "X"
 gumball_dir_e
         !text "/GUMBALL"
 gumball_e
--- a/src/demo/jungle.hunt.a
+++ b/src/demo/jungle.hunt.a
@ -51,7 +51,7 @@ jungle_hunt
         !byte jungle_hunt_e-jungle_hunt_b
 jungle_hunt_b
 jungle_hunt_dir_b
-         !text "X/JUNGLE.HUNT"
+         !text "X"
 jungle_hunt_dir_e
         !text "/JUNGLE.HUNT"
 jungle_hunt_e
--- a/src/demo/karateka.a
+++ b/src/demo/karateka.a
@ -92,7 +92,7 @@ karateka
         !byte karateka_e-karateka_b
 karateka_b
 karateka_dir_b
-         !text "X/KARATEKA"
+         !text "X"
 karateka_dir_e
         !text "/KARATEKA"
 karateka_e
--- a/src/demo/labyrinth.a
+++ b/src/demo/labyrinth.a
@ -43,7 +43,7 @@ labyrinth
         !byte labyrinth_e-labyrinth_b
 labyrinth_b
 labyrinth_dir_b
-         !text "X/LABYRINTH"
+         !text "X"
 labyrinth_dir_e
         !text "/LABYRINTH"
 labyrinth_e
--- a/src/demo/lady.tut.a
+++ b/src/demo/lady.tut.a
@ -51,5 +51,5 @@ callback
 patch    !byte $4C,$70,$00

 title    !byte x_e-x_b
-x_b      !text "X/LADY.TUT/LADY.TUT"
+x_b      !text "X/LADY.TUT"
 x_e
--- a/src/demo/lode.runner.a
+++ b/src/demo/lode.runner.a
@ -42,7 +42,7 @@ lode_runner
         !byte lode_runner_e-lode_runner_b
 lode_runner_b
 lode_runner_dir_b
-         !text "X/LODE.RUNNER"
+         !text "X"
 lode_runner_dir_e
         !text "/LODE.RUNNER"
 lode_runner_e
--- a/src/demo/mr.cool.a
+++ b/src/demo/mr.cool.a
@ -41,7 +41,7 @@ patch2   !byte $20,<callback,>callback
 mr_cool  !byte mr_cool_e-mr_cool_b
 mr_cool_b
 mr_cool_dir_b
-         !text "X/MC"
+         !text "X"
 mr_cool_dir_e
         !text "/MC"
 mr_cool_e
--- a/src/demo/nightmare.a
+++ b/src/demo/nightmare.a
@ -40,7 +40,7 @@ nightmare
         !byte nightmare_e-nightmare_b
 nightmare_b
 nightmare_dir_b
-         !text "X/NI"
+         !text "X"
 nightmare_dir_e
         !text "/NI"
 nightmare_e
--- a/src/demo/pieman.a
+++ b/src/demo/pieman.a
@ -44,7 +44,7 @@ patch2   !byte $4C,$97,$0A
 pieman   !byte pieman_e-pieman_b
 pieman_b
 pieman_dir_b
-         !text "X/PM"
+         !text "X"
 pieman_dir_e
         !text "/PM"
 pieman_e
--- a/src/demo/plasmania.a
+++ b/src/demo/plasmania.a
@ -47,7 +47,7 @@ callback
 patch    !byte $4C,$00,$01

 title    !byte x_e-x_b
-x_b      !text "X/PLASMANIA/PLASMANIA"
+x_b      !text "X/PLASMANIA"
 x_e

 !if * > $3F0 {
--- a/src/demo/repton.a
+++ b/src/demo/repton.a
@ -38,7 +38,7 @@ patch2   !byte $4C,$00,$01
 repton   !byte repton_e-repton_b
 repton_b
 repton_dir_b
-         !text "X/REPTON"
+         !text "X"
 repton_dir_e
         !text "/REPTON"
 repton_e
--- a/src/demo/sammy.lightfoot.a
+++ b/src/demo/sammy.lightfoot.a
@ -53,7 +53,7 @@ sammy_lightfoot
         !byte sammy_lightfoot_e-sammy_lightfoot_b
 sammy_lightfoot_b
 sammy_lightfoot_dir_b
-         !text "X/SAMMY.LIGHTFOOT"
+         !text "X"
 sammy_lightfoot_dir_e
         !text "/SAMMY.LIGHTFOOT"
 sammy_lightfoot_e
--- a/src/demo/serpentine.a
+++ b/src/demo/serpentine.a
@ -52,7 +52,7 @@ serpentine
         !byte serpentine_e-serpentine_b
 serpentine_b
 serpentine_dir_b
-         !text "X/SERPENTINE"
+         !text "X"
 serpentine_dir_e
         !text "/SERPENTINE"
 serpentine_e
--- a/src/demo/short.circuit.a
+++ b/src/demo/short.circuit.a
@ -41,7 +41,7 @@ short_circuit
         !byte short_circuit_e-short_circuit_b
 short_circuit_b
 short_circuit_dir_b
-         !text "X/SHORT.CIRCUIT"
+         !text "X"
 short_circuit_dir_e
         !text "/SHORT.CIRCUIT"
 short_circuit_e
--- a/src/demo/spare.change.a
+++ b/src/demo/spare.change.a
@ -38,7 +38,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.1.a
+++ b/src/demo/spcartoon.1.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.2.a
+++ b/src/demo/spcartoon.2.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.3.a
+++ b/src/demo/spcartoon.3.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.4.a
+++ b/src/demo/spcartoon.4.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.5.a
+++ b/src/demo/spcartoon.5.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spcartoon.6.a
+++ b/src/demo/spcartoon.6.a
@ -33,7 +33,7 @@ spare_change
         !byte spare_change_e-spare_change_b
 spare_change_b
 spare_change_dir_b
-         !text "X/SPARE.CHANGE"
+         !text "X"
 spare_change_dir_e
         !text "/SPARE.CHANGE"
 spare_change_e
--- a/src/demo/spys.demise.a
+++ b/src/demo/spys.demise.a
@ -38,7 +38,7 @@ sd
         !byte sd_e-sd_b
 sd_b
 sd_dir_b
-         !text "X/SD"
+         !text "X"
 sd_dir_e
         !text "/SD"
 sd_e
--- a/src/demo/stellar.7.a
+++ b/src/demo/stellar.7.a
@ -39,9 +39,12 @@ callback1
         sta   $A572
         lda   #>callback2
         sta   $A573
+         ldx   #0
+         stx   $A473
+         stx   $A476
+         stx   $A47A      ; start demo immediately
         lda   #$4C
         sta   $A484
-         ldx   #0
         stx   $A485
         inx
         stx   $A486
@ -65,8 +68,7 @@ stellar_7
         !byte stellar_7_e-stellar_7_b
 stellar_7_b
 stellar_7_dir_b
-         !text "X/STELLAR.7"
+         !text "X/STEL.DIR"
 stellar_7_dir_e
-         !text "/"
-         !text "STELLAR.7"
+         !text "/STELLAR.7"
 stellar_7_e
--- a/src/demo/the.goonies.a
+++ b/src/demo/the.goonies.a
@ -58,7 +58,7 @@ the_goonies
         !byte the_goonies_e-the_goonies_b
 the_goonies_b
 the_goonies_dir_b
-         !text "X/THE.GOONIES"
+         !text "X"
 the_goonies_dir_e
         !text "/THE.GOONIES"
 the_goonies_e
--- a/src/demo/thunder.bombs.a
+++ b/src/demo/thunder.bombs.a
@ -73,7 +73,7 @@ thunder_bombs
         !byte thunder_bombs_e-thunder_bombs_b
 thunder_bombs_b
 thunder_bombs_dir_b
-         !text "X/THUNDER.BOMBS"
+         !text "X"
 thunder_bombs_dir_e
         !text "/THUNDER.BOMBS"
 thunder_bombs_e
--- a/src/demo/tubeway.a
+++ b/src/demo/tubeway.a
@ -47,7 +47,7 @@
 patch    !byte $4C,$00,$01

 title    !byte x_e-x_b
-x_b      !text "X/TB/TB"
+x_b      !text "X/TB"
 x_e

 !if * > $3F0 {
--- a/src/demo/vindicator.a
+++ b/src/demo/vindicator.a
@ -48,7 +48,7 @@ vindicator
         !byte vindicator_e-vindicator_b
 vindicator_b
 vindicator_dir_b
-         !text "X/VINDICATOR"
+         !text "X"
 vindicator_dir_e
         !text "/VINDICATOR"
 vindicator_e
--- a/src/demo/warp.destroyer.a
+++ b/src/demo/warp.destroyer.a
@ -59,7 +59,7 @@ warp_destoyer
         !byte warp_destoyer_e-warp_destoyer_b
 warp_destoyer_b
 warp_destoyer_dir_b
-         !text "X/WARP.DESTROYER"
+         !text "X"
 warp_destoyer_dir_e
         !text "/WARP.DESTROYER"
 warp_destoyer_e
--- a/src/glue.launch.a
+++ b/src/glue.launch.a
@ -158,49 +158,15 @@ PlayGameInAY
         jmp   Launch

@loadFromSubdirectory
-         ; we start by placing the subdirectory name at gPathname+kGameDirectoryLen
-         ; to leave room for the GameDirectory name as the parent
-
-         lda   #kGameDirectoryLen
-         sta   gPathname
         +LD16 SAVE
-         jsr   AddToPath
+         +ST16 @p

-         ; attach the separator
-
-         inc   gPathname
-         lda   #'/'
-         sta   gPathname+1,x
-
-         ; then we save the length of the resulting string without the count byte
-
-         dex
-         txa
-         pha
-
-         ; then attach the game name
-
-         +LD16 SAVE
-         jsr   AddToPath
-
-         ; don't look while I do this
-         ; we "place" a string at gPathname+kGameDirectoryLen
-         ; whose length is the subdirectory name and game name
-         ; then we load it
-         ; the load sets the path to the GameDirectory
-         ; and then finds the subdirectory name and game name right after it
-         ; and attaches it to the path by overwriting the count byte
-
-         ;;sec ; carry set by AddToPath
-         lda   gPathname
-         sbc   #kGameDirectoryLen
-         sta   gPathname+kGameDirectoryLen
         jsr   LoadFile              ; load the game startup file
         !word kGameDirectory
-         !word gPathname+kGameDirectoryLen
+@p       !word $FDFD
         !word 0                     ; use file's default address

-         pla
+         lda   #1
         sta   ProDOS_prefix         ; set 'root' directory to the path part
                                     ; of the game startup file we just loaded
                                     ; so games can load other files without
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15606670
+         !be24  15605888
         !le16     5112
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15551801
+         !be24  15551019
         !le16     5732
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15482686
+         !be24  15481904
         !le16     4192
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15497345
+         !be24  15496563
         !le16     4650
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15516059
+         !be24  15515277
         !le16     6069
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15537549
+         !be24  15536767
         !le16     6688
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15611782
+         !be24  15611000
         !le16      410
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15612536
+         !be24  15611754
         !le16      449
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15612985
+         !be24  15612203
         !le16      303
--- a/src/index/demo.idx.a
+++ b/src/index/demo.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  12378958
+         !be24  12378176
         !le16     1652
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15560173
+         !be24  15559391
         !le16     1640
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15612268
+         !be24  15611486
         !le16       67
--- a/src/index/dgr.idx.a
+++ b/src/index/dgr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15606611
+         !be24  15605829
         !le16       59
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15605031
+         !be24  15604249
         !le16     1426
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15589797
+         !be24  15589015
         !le16      557
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15557533
+         !be24  15556751
         !le16     2640
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15562171
+         !be24  15561389
         !le16     7564
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15612192
+         !be24  15611410
         !le16       76
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15606457
+         !be24  15605675
         !le16      154
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15612335
+         !be24  15611553
         !le16      201
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15590354
+         !be24  15589572
         !le16     4352
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15594706
+         !be24  15593924
         !le16     1733
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15596439
+         !be24  15595657
         !le16     1181
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15597620
+         !be24  15596838
         !le16     3376
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15600996
+         !be24  15600214
         !le16     3429
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15604425
+         !be24  15603643
         !le16      479
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15604904
+         !be24  15604122
         !le16      127
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15613288
+         !be24  15612506
         !le16     2370
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15575140
+         !be24  15574358
         !le16     5083
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15580223
+         !be24  15579441
         !le16     2485
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15544237
+         !be24  15543455
         !le16     7564
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15473156
+         !be24  15472374
         !le16     9530
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15486878
+         !be24  15486096
         !le16    10467
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15501995
+         !be24  15501213
         !le16    14064
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15522128
+         !be24  15521346
         !le16    15421
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15561813
+         !be24  15561031
         !le16      358
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15569735
+         !be24  15568953
         !le16     5405
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15582708
+         !be24  15581926
         !le16     7089
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  15468808
+         !be24  15468026
         !le16     4348
--- a/src/prelaunch/colorix.a
+++ b/src/prelaunch/colorix.a
@ -14,6 +14,7 @@
         ldx   #0
         stx   $2539
         inx
+         stx   $1821      ; reset vector
         stx   $253A      ; allow quit
         lda   #$96
         sta   $74        ; Basic hook
--- a/src/prelaunch/death.sword.a
+++ b/src/prelaunch/death.sword.a
@ -8,6 +8,7 @@
    !source "src/prelaunch/common.a"

           +ENABLE_ACCEL
+           +NEW_RESET_VECTOR $300
           lda   #$8b
           sta   $bf0e      ; disable ROM mapping
           lda   #$60
--- a/src/prelaunch/run.for.money.a
+++ b/src/prelaunch/run.for.money.a
@ -11,10 +11,7 @@
         lda   #$60
         sta   $897
         jsr   $800       ; decompress
-         ldx   #0
-         stx   $43B3
-         inx
-         stx   $43B8      ; reset vector
+         inc   $43BD      ; reboot
         +DISABLE_ACCEL

         jmp   $4000
Author	SHA1	Message	Date
Peter Ferrie	c2de0a2ccc	fix Run For The Money reset vector	2024-05-11 14:38:36 -07:00
Peter Ferrie	edd6192a22	fix Death Sword reset vector	2024-05-11 14:38:23 -07:00
Peter Ferrie	b8e7d480e6	fix Colorix reset vector	2024-05-11 14:38:06 -07:00
4am	7cc7fd357b	simplify Makefile slightly	2024-05-11 10:55:14 -04:00
4am	a7efbea1f8	flatten subdirectories to shave some blocks	2024-05-11 10:36:50 -04:00