From e6c39fb0e249a37abb7ad39191cb64e9566bd97a Mon Sep 17 00:00:00 2001 From: 4am Date: Tue, 20 Feb 2018 16:37:28 -0500 Subject: [PATCH] . --- Makefile | 42 ++++++++++++------ ...rk.master games collection.do.not.edit.2mg | Bin 33553984 -> 33553984 bytes res/_FileInformation.txt | 7 ++- res/pitchdark.po | Bin 143360 -> 143360 bytes src/action.a | 4 +- src/{grue.s => grue.system.s} | 6 +-- src/{basis.s => onbeyond/onbeyond.system.s} | 4 +- src/{ => onbeyond}/z3/0800-23ff.org | Bin src/{ => onbeyond}/z3/0800-23ff.pak | Bin src/{ => onbeyond}/z3/patchz3.s | 0 src/{ => onbeyond}/z3/z3.s | 4 +- src/{ => onbeyond}/z4/0800-08ff.org | Bin src/{ => onbeyond}/z4/0800-08ff.pak | Bin src/{ => onbeyond}/z4/d500-f7ff.org | Bin src/{ => onbeyond}/z4/d500-f7ff.pak | Bin src/{ => onbeyond}/z4/z4.s | 12 ++--- src/{ => onbeyond}/z5/0800-09ff.org | Bin src/{ => onbeyond}/z5/0800-09ff.pak | Bin src/{ => onbeyond}/z5/d500-ffff.org | Bin src/{ => onbeyond}/z5/d500-ffff.pak | Bin src/{ => onbeyond}/z5/z5.s | 16 ++++--- src/{ => onbeyond}/z5u/0800-09ff.org | Bin src/{ => onbeyond}/z5u/0800-09ff.pak | Bin src/{ => onbeyond}/z5u/d500-ffff.org | Bin src/{ => onbeyond}/z5u/d500-ffff.pak | Bin src/{ => onbeyond}/z5u/z5u.s | 16 ++++--- src/pitchdark.a | 22 ++++----- 27 files changed, 81 insertions(+), 52 deletions(-) rename src/{grue.s => grue.system.s} (95%) rename src/{basis.s => onbeyond/onbeyond.system.s} (97%) rename src/{ => onbeyond}/z3/0800-23ff.org (100%) rename src/{ => onbeyond}/z3/0800-23ff.pak (100%) rename src/{ => onbeyond}/z3/patchz3.s (100%) rename src/{ => onbeyond}/z3/z3.s (97%) rename src/{ => onbeyond}/z4/0800-08ff.org (100%) rename src/{ => onbeyond}/z4/0800-08ff.pak (100%) rename src/{ => onbeyond}/z4/d500-f7ff.org (100%) rename src/{ => onbeyond}/z4/d500-f7ff.pak (100%) rename src/{ => onbeyond}/z4/z4.s (99%) rename src/{ => onbeyond}/z5/0800-09ff.org (100%) rename src/{ => onbeyond}/z5/0800-09ff.pak (100%) rename src/{ => onbeyond}/z5/d500-ffff.org (100%) rename src/{ => onbeyond}/z5/d500-ffff.pak (100%) rename src/{ => onbeyond}/z5/z5.s (99%) rename src/{ => onbeyond}/z5u/0800-09ff.org (100%) rename src/{ => onbeyond}/z5u/0800-09ff.pak (100%) rename src/{ => onbeyond}/z5u/d500-ffff.org (100%) rename src/{ => onbeyond}/z5u/d500-ffff.pak (100%) rename src/{ => onbeyond}/z5u/z5u.s (99%) 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 a6dc8ad72569f95f513bfddde2e5881280021e71..711def91bdfc50e06211b02194314f1b56c05b54 100644 GIT binary patch delta 154880 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 delta 120 zcmZp8z|ru4V}mLSBlBc679CY-_n=T$z2L~;5LaIYAo#Dzz{s$Jfx$zCk&l7lF@u7K ziWTqVa+X3?cNJBBrp=5@!i<~PSlQU^|1&UtV6flJ!z0nG3 Y@8*CR8<-c(Wn3)4#Mm@%**wNc0JU5lVgLXD 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