move master Z files to separate folder

Makefile

@@ -9,7 +9,8 @@
 # adapted by 4am on 2018-07-07
 #
 
-DISK=Pitch Darker.hdv
+BUILDDISK=build/Pitch Darker.hdv
+VOLUME=PITCH.DARKER
 
 # third-party tools required to build
 # https://sourceforge.net/projects/acme-crossass/
@@ -37,42 +38,34 @@ asm: md
 	$(ACME) -r build/zinfo5u.lst src/zinfo/z5u/z5u.s
 
 dsk: md asm
-	cp res/"pitch-darker.hdv" build/"$(DISK)"
+	cp res/blank.hdv "$(BUILDDISK)"
 	cp res/_FileInformation.txt build/
 	bin/fixFileInformation.sh build/_FileInformation.txt
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "build/GRUE.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "build/ONBEYOND.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "build/ZINFO.SYSTEM"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "build/PITCH.DARK"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "res/PITCH.DARK.CONF"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "res/GAMES.CONF"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/" "res/CREDITS.TXT"
-	$(CADIUS) CREATEFOLDER build/"$(DISK)" "/PITCH.DARKER/LIB/"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ1"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ2"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ3"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ4"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ5"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ONBEYONDZ5U"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO1"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO2"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO3"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO4"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO5"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/LIB/" "build/ZINFO5U"
+	$(CADIUS) CREATEFOLDER "$(BUILDDISK)" "/$(VOLUME)/Z/"
+	for f in res/Z/*; do \
+		$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/Z/$$(basename $$f)" "$$f"; \
+	done
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/" "res/HINTS"
+	for f in "build/GRUE.SYSTEM" "build/ONBEYOND.SYSTEM" "build/ZINFO.SYSTEM" "build/PITCH.DARK" "res/PITCH.DARK.CONF" "res/GAMES.CONF" "res/CREDITS.TXT"; do \
+		$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/" "$$f"; \
+	done
+	$(CADIUS) CREATEFOLDER "$(BUILDDISK)" "/$(VOLUME)/LIB/"
+	for f in ONBEYONDZ1 ONBEYONDZ2 ONBEYONDZ3 ONBEYONDZ4 ONBEYONDZ5 ONBEYONDZ5U ZINFO1 ZINFO2 ZINFO3 ZINFO4 ZINFO5 ZINFO5U; do \
+		$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/LIB/" "build/$$f"; \
+	done
 
 txt: dsk
-	mkdir -p build/text
+	mkdir -p build/TEXT
 	$(PY3) bin/textnormalize.py res/text/*
-	cd build && $(CADIUS) ADDFOLDER "$(DISK)" "/PITCH.DARKER/TEXT" text
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/TEXT" build/TEXT
 
 artwork: dsk
-	$(CADIUS) ADDFOLDER build/"$(DISK)" "/PITCH.DARKER/ARTWORK" "res/artwork"
-	$(CADIUS) ADDFILE build/"$(DISK)" "/PITCH.DARKER/ARTWORK/" "res/DHRSLIDE.SYSTEM"
-	$(CADIUS) ADDFOLDER build/"$(DISK)" "/PITCH.DARKER/ARTWORKGS" "res/artworkgs"
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/ARTWORK" "res/artwork"
+	$(CADIUS) ADDFILE "$(BUILDDISK)" "/$(VOLUME)/ARTWORK/" "res/DHRSLIDE.SYSTEM"
+	$(CADIUS) ADDFOLDER "$(BUILDDISK)" "/$(VOLUME)/ARTWORKGS" "res/artworkgs"
 
 mount: dsk
-	osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii build/"$(DISK)"
+	osascript bin/V2Make.scpt "`pwd`" bin/pitchdark.vii "$(BUILDDISK)"
 
 md:	sync
 	mkdir -p build

patches/ui.common.a.patch

@@ -1,5 +1,5 @@
 --- ../pitch-dark/src/ui.common.a	2018-07-21 10:34:52
-+++ src/ui.common.a	2023-05-03 00:39:32
++++ src/ui.common.a	2023-11-22 17:43:14
 @@ -31,11 +31,11 @@
           !byte 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
  

patches/ui.credits.a.patch

@@ -1,5 +1,5 @@
 --- ../pitch-dark/src/ui.credits.a	2023-05-03 00:07:25
-+++ src/ui.credits.a	2023-05-03 00:39:32
++++ src/ui.credits.a	2023-11-22 17:43:14
 @@ -226,17 +226,17 @@
           !word $FDFD
  

res/CREDITS.TXT

@@ -0,0 +1 @@
+Pitch Darker is a collection of modern
interactive fiction for 8-bit Apple II.

Release 3 / Serial number DEVELOP

Copyright 2018-2023 4am

https://github.com/a2-4am/pitch-darker

                   ~

On Beyond Z-Machine! is a ProDOS port
of Infocom's Z-Machine interpreters.

Copyright 2018-2023 qkumba

based on code from six different games
copyright 1979-1988 Infocom, Inc.

                   ~

WeeGUI is a compact, easy-to-use GUI
library for 8-bit Apple II computers.

Copyright 2014-2018 Quinn Dunki

https://github.com/blondie7575/WeeGUI/

                   ~

The Interactive Fiction Database is
relevant to your interests.

https://ifdb.org/

                   ~

Individual games are copyright their
respective authors. Many games are
license-restricted to personal, non-
commercial distribution.

                   ~

XYZZY

                 [EOF]

res/credits.txt

@@ -1 +0,0 @@
-Pitch Darker is a collection of modern
interactive fiction for 8-bit Apple II.

Release 2 / Serial number 20230503

Copyright 2018-2023 4am

https://github.com/a2-4am/pitch-darker

                   ~

On Beyond Z-Machine! is a ProDOS port
of Infocom's Z-Machine interpreters.

Copyright 2018-2023 qkumba

based on code from six different games
copyright 1979-1988 Infocom, Inc.

                   ~

WeeGUI is a compact, easy-to-use GUI
library for 8-bit Apple II computers.

Copyright 2014-2018 Quinn Dunki

https://github.com/blondie7575/WeeGUI/

                   ~

The Interactive Fiction Database is
relevant to your interests.

https://ifdb.org/

                   ~

Individual games are copyright their
respective authors. Many games are
license-restricted to personal, non-
commercial distribution.

                   ~

XYZZY

                 [EOF]