diff --git a/Makefile b/Makefile index 0d221d0..e1687ae 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # adapted by 4am on 2018-01-07 # -DISK=pitchdark.po +DISK=PitchDark.2mg # third-party tools required to build # https://sourceforge.net/projects/acme-crossass/ @@ -18,24 +18,38 @@ ACME=acme # https://github.com/mach-kernel/cadius CADIUS=cadius -asm: +md: mkdir -p build - cd src && $(ACME) pitchdark.a - -dsk: asm - cp res/$(DISK) build/ - cp res/_FileInformation.txt build/ - $(CADIUS) ADDFILE build/$(DISK) "/PDBOOT/" "build/PITCH.DARK" - -txt: dsk - mkdir -p build/text - $(PY3) bin/textnormalize.py text/* - cd build && $(CADIUS) ADDFOLDER $(DISK) "/PDBOOT/TEXT" text clean: rm -rf build/ -mount: +asm: md + $(ACME) src/grue.system.s + $(ACME) src/pitchdark.a + $(ACME) src/onbeyond/onbeyond.system.s + $(ACME) src/onbeyond/z3/z3.s + $(ACME) src/onbeyond/z4/z4.s + $(ACME) src/onbeyond/z5/z5.s + $(ACME) src/onbeyond/z5u/z5u.s + +dsk: md asm + cp res/"Pitch Dark.master games collection.do.not.edit.2mg" build/$(DISK) + cp res/_FileInformation.txt build/ + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/GRUE.SYSTEM" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/PITCH.DARK" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/ONBEYOND.SYSTEM" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/ONBEYONDZ3" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/ONBEYONDZ4" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/ONBEYONDZ5" + $(CADIUS) ADDFILE build/$(DISK) "/PITCH.DARK/" "build/ONBEYONDZ5U" + +txt: md dsk + mkdir -p build/text + $(PY3) bin/textnormalize.py text/* + cd build && $(CADIUS) ADDFOLDER $(DISK) "/PITCH.DARK/TEXT" text + +mount: dsk osascript bin/V2Make.scpt "`pwd`" build/$(DISK) all: clean asm dsk txt mount diff --git a/res/Pitch Dark.master games collection.do.not.edit.2mg b/res/Pitch Dark.master games collection.do.not.edit.2mg index a6dc8ad..711def9 100644 Binary files a/res/Pitch Dark.master games collection.do.not.edit.2mg and b/res/Pitch Dark.master games collection.do.not.edit.2mg differ diff --git a/res/_FileInformation.txt b/res/_FileInformation.txt index 876c953..1db73a7 100644 --- a/res/_FileInformation.txt +++ b/res/_FileInformation.txt @@ -1,2 +1,7 @@ +GRUE.SYSTEM=Type(FF),AuxType(2000),VersionCreate(70),MinVersion(BE),Access(C3) PITCH.DARK=Type(06),AuxType(6000),VersionCreate(70),MinVersion(BE),Access(C3) - +ONBEYOND.SYSTEM=Type(FF),AuxType(2000),VersionCreate(70),MinVersion(BE),Access(C3) +ONBEYONDZ3=Type(06),AuxType(3000),VersionCreate(70),MinVersion(BE),Access(C3) +ONBEYONDZ4=Type(06),AuxType(3000),VersionCreate(70),MinVersion(BE),Access(C3) +ONBEYONDZ5=Type(06),AuxType(3000),VersionCreate(70),MinVersion(BE),Access(C3) +ONBEYONDZ5U=Type(06),AuxType(3000),VersionCreate(70),MinVersion(BE),Access(C3) diff --git a/res/pitchdark.po b/res/pitchdark.po index cb36777..038f1ea 100644 Binary files a/res/pitchdark.po and b/res/pitchdark.po differ diff --git a/src/action.a b/src/action.a index 96d1f15..c88deb1 100644 --- a/src/action.a +++ b/src/action.a @@ -158,6 +158,6 @@ LaunchInterpreter .nope sec rts .interpreterFilename - !byte 18 - !raw "BIN/INTERPP.SYSTEM" + !byte 15 + !raw "ONBEYOND.SYSTEM" } diff --git a/src/grue.s b/src/grue.system.s similarity index 95% rename from src/grue.s rename to src/grue.system.s index 62cac1d..b6d08c8 100644 --- a/src/grue.s +++ b/src/grue.system.s @@ -3,7 +3,7 @@ !cpu 6502 *=$2000 -!to "../build/GRUE.SYSTEM#FF2000",plain +!to "build/GRUE.SYSTEM",plain - jsr $bf00 op_c7 @@ -17,7 +17,7 @@ op_c7 !byte $c5 !word c5_parms ldx runme+prefix+1-reloc - inx + inx txa and #$0f sta runme+prefix-reloc @@ -27,7 +27,7 @@ op_c7 bne - + lda #prefix + lda #>prefix sta runme+c6_parms+2-reloc lda $c083 lda $c083 diff --git a/src/basis.s b/src/onbeyond/onbeyond.system.s similarity index 97% rename from src/basis.s rename to src/onbeyond/onbeyond.system.s index 2209606..3f381f9 100644 --- a/src/basis.s +++ b/src/onbeyond/onbeyond.system.s @@ -1,7 +1,7 @@ ;license:MIT ;(c) 2018 by qkumba -!to "..\build\basis.system#ff0000",plain +!to "build/ONBEYOND.SYSTEM",plain *=$2000 jmp init @@ -159,4 +159,4 @@ filename !text "ONBEYONDZ5U" filename_e -!byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE \ No newline at end of file +!byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE diff --git a/src/z3/0800-23ff.org b/src/onbeyond/z3/0800-23ff.org similarity index 100% rename from src/z3/0800-23ff.org rename to src/onbeyond/z3/0800-23ff.org diff --git a/src/z3/0800-23ff.pak b/src/onbeyond/z3/0800-23ff.pak similarity index 100% rename from src/z3/0800-23ff.pak rename to src/onbeyond/z3/0800-23ff.pak diff --git a/src/z3/patchz3.s b/src/onbeyond/z3/patchz3.s similarity index 100% rename from src/z3/patchz3.s rename to src/onbeyond/z3/patchz3.s diff --git a/src/z3/z3.s b/src/onbeyond/z3/z3.s similarity index 97% rename from src/z3/z3.s rename to src/onbeyond/z3/z3.s index a5f8bab..210ef46 100644 --- a/src/z3/z3.s +++ b/src/onbeyond/z3/z3.s @@ -2,7 +2,7 @@ ;(c) 2017-2018 by qkumba !cpu 6502 -!to "..\..\build\ONBEYONDZ3#063000",plain +!to "build/ONBEYONDZ3",plain *=$3000 vars=$306 @@ -219,4 +219,4 @@ c4_parms !byte $0a quit_parms !byte 4 pakoff -!bin "0800-23ff.pak" +!bin "src/onbeyond/z3/0800-23ff.pak" diff --git a/src/z4/0800-08ff.org b/src/onbeyond/z4/0800-08ff.org similarity index 100% rename from src/z4/0800-08ff.org rename to src/onbeyond/z4/0800-08ff.org diff --git a/src/z4/0800-08ff.pak b/src/onbeyond/z4/0800-08ff.pak similarity index 100% rename from src/z4/0800-08ff.pak rename to src/onbeyond/z4/0800-08ff.pak diff --git a/src/z4/d500-f7ff.org b/src/onbeyond/z4/d500-f7ff.org similarity index 100% rename from src/z4/d500-f7ff.org rename to src/onbeyond/z4/d500-f7ff.org diff --git a/src/z4/d500-f7ff.pak b/src/onbeyond/z4/d500-f7ff.pak similarity index 100% rename from src/z4/d500-f7ff.pak rename to src/onbeyond/z4/d500-f7ff.pak diff --git a/src/z4/z4.s b/src/onbeyond/z4/z4.s similarity index 99% rename from src/z4/z4.s rename to src/onbeyond/z4/z4.s index 02d03a0..c46839e 100644 --- a/src/z4/z4.s +++ b/src/onbeyond/z4/z4.s @@ -9,7 +9,7 @@ ver_02 = 1 } else { ;ver_02 !cpu 65c02 } ;ver_02 -!to "..\..\build\ONBEYONDZ4#063000",plain +!to "build/ONBEYONDZ4",plain *=$3000 xsechi=$b1 @@ -27,7 +27,7 @@ tmp = $8 ;place no code before init label below. ;user-defined options - verbose_info = 1 ;set to 1 to enable display of memory usage + verbose_info = 0 ;set to 1 to enable display of memory usage poll_drive = 0 ;set to 1 to check if disk is in drive, recommended if allow_multi is enabled override_adr = 1 ;set to 1 to require an explicit load address aligned_read = 0 ;set to 1 if all reads can be a multiple of block size @@ -1779,7 +1779,9 @@ xrestore !byte $d2,$c5,$d3,$d4,$cf,$d2,$c5,$8d callback_e } -!warn "base=",$300-(callback_e-callback1) +!if verbose_info = 1 { + !warn "base=",$300-(callback_e-callback1) +} unpack ;unpacker entrypoint lda #0 @@ -1936,8 +1938,8 @@ getsrc sty tmp rts pakoff -!bin "d500-f7ff.pak" -!bin "0800-08ff.pak" +!bin "src/onbeyond/z4/d500-f7ff.pak" +!bin "src/onbeyond/z4/0800-08ff.pak" readbuff !byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE diff --git a/src/z5/0800-09ff.org b/src/onbeyond/z5/0800-09ff.org similarity index 100% rename from src/z5/0800-09ff.org rename to src/onbeyond/z5/0800-09ff.org diff --git a/src/z5/0800-09ff.pak b/src/onbeyond/z5/0800-09ff.pak similarity index 100% rename from src/z5/0800-09ff.pak rename to src/onbeyond/z5/0800-09ff.pak diff --git a/src/z5/d500-ffff.org b/src/onbeyond/z5/d500-ffff.org similarity index 100% rename from src/z5/d500-ffff.org rename to src/onbeyond/z5/d500-ffff.org diff --git a/src/z5/d500-ffff.pak b/src/onbeyond/z5/d500-ffff.pak similarity index 100% rename from src/z5/d500-ffff.pak rename to src/onbeyond/z5/d500-ffff.pak diff --git a/src/z5/z5.s b/src/onbeyond/z5/z5.s similarity index 99% rename from src/z5/z5.s rename to src/onbeyond/z5/z5.s index 61947ce..6b95642 100644 --- a/src/z5/z5.s +++ b/src/onbeyond/z5/z5.s @@ -9,7 +9,7 @@ ver_02 = 1 } else { ;ver_02 !cpu 65c02 } ;ver_02 -!to "..\..\build\ONBEYONDZ5#063000",plain +!to "build/ONBEYONDZ5",plain *=$3000 xsechi=$b7 @@ -27,7 +27,7 @@ tmp = $8 ;place no code before init label below. ;user-defined options - verbose_info = 1 ;set to 1 to enable display of memory usage + verbose_info = 0 ;set to 1 to enable display of memory usage poll_drive = 0 ;set to 1 to check if disk is in drive, recommended if allow_multi is enabled override_adr = 1 ;set to 1 to require an explicit load address aligned_read = 0 ;set to 1 if all reads can be a multiple of block size @@ -1590,7 +1590,9 @@ printchar + jmp $d1d1 casemap_e } -!warn "case=",$300-(casemap_e-casemap) +!if verbose_info = 1 { + !warn "case=",$300-(casemap_e-casemap) +} saveme !pseudopc $300 { @@ -1780,7 +1782,9 @@ xrestore !byte $d2,$c5,$d3,$d4,$cf,$d2,$c5,$8d callback_e } -!warn "base=",casemap-(callback_e-callback1) +!if verbose_info = 1 { + !warn "base=",casemap-(callback_e-callback1) +} unpack ;unpacker entrypoint lda #0 @@ -1938,8 +1942,8 @@ getsrc sty tmp rts pakoff -!bin "d500-ffff.pak" -!bin "0800-09ff.pak" +!bin "src/onbeyond/z5/d500-ffff.pak" +!bin "src/onbeyond/z5/0800-09ff.pak" readbuff !byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE diff --git a/src/z5u/0800-09ff.org b/src/onbeyond/z5u/0800-09ff.org similarity index 100% rename from src/z5u/0800-09ff.org rename to src/onbeyond/z5u/0800-09ff.org diff --git a/src/z5u/0800-09ff.pak b/src/onbeyond/z5u/0800-09ff.pak similarity index 100% rename from src/z5u/0800-09ff.pak rename to src/onbeyond/z5u/0800-09ff.pak diff --git a/src/z5u/d500-ffff.org b/src/onbeyond/z5u/d500-ffff.org similarity index 100% rename from src/z5u/d500-ffff.org rename to src/onbeyond/z5u/d500-ffff.org diff --git a/src/z5u/d500-ffff.pak b/src/onbeyond/z5u/d500-ffff.pak similarity index 100% rename from src/z5u/d500-ffff.pak rename to src/onbeyond/z5u/d500-ffff.pak diff --git a/src/z5u/z5u.s b/src/onbeyond/z5u/z5u.s similarity index 99% rename from src/z5u/z5u.s rename to src/onbeyond/z5u/z5u.s index 7f60cb8..2b4292a 100644 --- a/src/z5u/z5u.s +++ b/src/onbeyond/z5u/z5u.s @@ -9,7 +9,7 @@ ver_02 = 1 } else { ;ver_02 !cpu 65c02 } ;ver_02 -!to "..\..\build\ONBEYONDZ5U#063000",plain +!to "build/ONBEYONDZ5U",plain *=$3000 xsechi=$b6 @@ -27,7 +27,7 @@ tmp = $8 ;place no code before init label below. ;user-defined options - verbose_info = 1 ;set to 1 to enable display of memory usage + verbose_info = 0 ;set to 1 to enable display of memory usage poll_drive = 0 ;set to 1 to check if disk is in drive, recommended if allow_multi is enabled override_adr = 1 ;set to 1 to require an explicit load address aligned_read = 0 ;set to 1 if all reads can be a multiple of block size @@ -1590,7 +1590,9 @@ printchar + jmp $d1d1 casemap_e } -!warn "case=",$300-(casemap_e-casemap) +!if verbose_info = 1 { + !warn "case=",$300-(casemap_e-casemap) +} saveme !pseudopc $300 { @@ -1780,7 +1782,9 @@ xrestore !byte $d2,$c5,$d3,$d4,$cf,$d2,$c5,$8d callback_e } -!warn "base=",casemap-(callback_e-callback1) +!if verbose_info = 1 { + !warn "base=",casemap-(callback_e-callback1) +} unpack ;unpacker entrypoint lda #0 @@ -1938,8 +1942,8 @@ getsrc sty tmp rts pakoff -!bin "d500-ffff.pak" -!bin "0800-09ff.pak" +!bin "src/onbeyond/z5u/d500-ffff.pak" +!bin "src/onbeyond/z5u/0800-09ff.pak" readbuff !byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE diff --git a/src/pitchdark.a b/src/pitchdark.a index 9fba37d..f30b48a 100644 --- a/src/pitchdark.a +++ b/src/pitchdark.a @@ -2,8 +2,8 @@ ;(c) 2018 by 4am !cpu 65c02 -!ct "lcase.ct" -!to "../build/PITCH.DARK",plain +!ct "src/lcase.ct" +!to "build/PITCH.DARK",plain *=$6000 lda #0 ; set Z flag always @@ -19,15 +19,15 @@ !byte 10 !raw "BIN/WEEGUI" - !source "WeeGUI_MLI.s" - !source "memory.a" - !source "prodos.a" - !source "ramdisk.a" - !source "path.a" - !source "prefs.a" - !source "config.a" - !source "action.a" - !source "paint.a" + !source "src/WeeGUI_MLI.s" + !source "src/memory.a" + !source "src/prodos.a" + !source "src/ramdisk.a" + !source "src/path.a" + !source "src/prefs.a" + !source "src/config.a" + !source "src/action.a" + !source "src/paint.a" Start lda MACHID and #$30