diff --git a/Makefile b/Makefile index 1f1866f..1e5014c 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,8 @@ asm: md $(ACME) -r build/grue.system.lst src/grue.system.s $(ACME) -r build/pitchdark.lst src/pitchdark.a $(ACME) -r build/onbeyond.system.lst src/onbeyond/onbeyond.system.s - $(ACME) -r build/z3.lst src/onbeyond/z1/z1.s - $(ACME) -r build/z3.lst src/onbeyond/z2/z2.s + $(ACME) -r build/z1.lst src/onbeyond/z1/z1.s + $(ACME) -r build/z2.lst src/onbeyond/z2/z2.s $(ACME) -r build/z3.lst src/onbeyond/z3/z3.s $(ACME) -r build/z4.lst src/onbeyond/z4/z4.s $(ACME) -r build/z5.lst src/onbeyond/z5/z5.s 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 6ffff70..47115f1 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 edcdb34..a68c573 100644 --- a/res/_FileInformation.txt +++ b/res/_FileInformation.txt @@ -2,6 +2,8 @@ GRUE.SYSTEM=Type(FF),AuxType(2000),Access(C3) PITCH.DARK=Type(06),AuxType(6000),Access(C3) PITCH.DARK.CONF=Type(04),AuxType(0000),Access(C3) ONBEYOND.SYSTEM=Type(FF),AuxType(2000),Access(C3) +ONBEYONDZ1=Type(06),AuxType(3000),Access(C3) +ONBEYONDZ2=Type(06),AuxType(3000),Access(C3) ONBEYONDZ3=Type(06),AuxType(3000),Access(C3) ONBEYONDZ4=Type(06),AuxType(3000),Access(C3) ONBEYONDZ5=Type(06),AuxType(3000),Access(C3) diff --git a/res/text/zork.i.txt b/res/text/zork.i.txt index 61b86aa..5722a7d 100644 --- a/res/text/zork.i.txt +++ b/res/text/zork.i.txt @@ -25,7 +25,6 @@ you new surprises no matter how many times you explore it. [versions] -R5.000000.Z1=r5 / 000000 R88.840726.Z3=r88 / 840726 R76.840509.Z3=r76 / 840509 R75.830929.Z3=r75 / 830929 @@ -35,6 +34,8 @@ R26.820803.Z3=r26 / 820803 R25.820515.Z3=r25 / 820515 R23.820428.Z3=r23 / 820428 R20.000000.Z3=r20 / 000000 +R15.UG3AU5.Z2=r15 / UG3AU5 +R5.000000.Z1=r5 / 000000 [options] diff --git a/res/text/zork.ii.txt b/res/text/zork.ii.txt index b47796f..6205927 100644 --- a/res/text/zork.ii.txt +++ b/res/text/zork.ii.txt @@ -32,6 +32,7 @@ R18B.820517.Z3=r18 / 820517 R18A.820512.Z3=r18 / 820512 R17.820427.Z3=r17 / 820427 R15.820308.Z3=r15 / 820308 +R7.UG3AU5.Z2=r7 / UG3AU5 [options] diff --git a/src/onbeyond/z2/z2.s b/src/onbeyond/z2/z2.s index b4da62f..ed8f7ec 100644 --- a/src/onbeyond/z2/z2.s +++ b/src/onbeyond/z2/z2.s @@ -2,7 +2,7 @@ ;(c) 2017-2018 by qkumba !cpu 6502 -!to "build/ONBEYONDZ2#063000",plain +!to "build/ONBEYONDZ2",plain *=$3000 !macro version {!scrxor $80, "1/180221"} @@ -579,4 +579,4 @@ getsrc pakoff !bin "src/onbeyond/z2/0800-21ff.pak" -!byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE \ No newline at end of file +!byte $D3,$C1,$CE,$A0,$C9,$CE,$C3,$AE