From f5077fdaf804d33242a05f814948c0d8e9537583 Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Sat, 3 Feb 2018 14:12:06 -0500 Subject: [PATCH] Minimal source changes required to build with LWASM Nothing major, mostly transliterating assembler directives and changing some referenced filenames, etc. Result builds to be identical to "Version C" ZIP taken from Zork I disk image found on colorcomputerarchive.com! --- boot.src | 38 ++++++++-------- bugger.src | 4 +- cocozip.src | 46 ++++++++++---------- disk.src | 84 ++++++++++++++++++------------------ dispatch.src | 138 +++++++++++++++++++++++++++++------------------------------ ioprims.src | 48 ++++++++++----------- main.src | 4 +- mainsubs.src | 4 +- objects.src | 4 +- ops0.src | 4 +- ops1.src | 4 +- ops2.src | 4 +- opsx.src | 4 +- paging.src | 10 ++--- read.src | 10 ++--- screen.src | 30 ++++++------- warm.src | 10 ++--- zequates.src | 6 +-- zstring.src | 16 +++---- 19 files changed, 234 insertions(+), 234 deletions(-) diff --git a/boot.src b/boot.src index b2f2278a1e25..688683b483d9 100644 --- a/boot.src +++ b/boot.src @@ -52,7 +52,7 @@ ZEND EQU $3000+BUG ORG $2600 - DB "OS" ; REQUIRED BY DOS + .STR "OS" ; REQUIRED BY DOS MOVE: LDX #00 ; SET UP TO MOVE BOOT CODE OUT OF WAY OF ZIP MOVLP: LDD HERE,X @@ -62,11 +62,11 @@ MOVLP: LDD HERE,X BLO MOVLP JMP RUN -HERE: EQU $ +HERE: EQU * ORG $5000 -THERE: EQU $ +THERE: EQU * RUN: LDX #DIRQSV ;SET VECTOR STX IRQVEC+1 @@ -102,10 +102,10 @@ DOBUFF: STD TRACK ;ERROR HANDLER -ERRM: DB $0D - DB "DISK ERRROR!" - DB $0D -ERRML: EQU $-ERRM +ERRM: .DB $0D + .STR "DISK ERRROR!" + .DB $0D +ERRML: EQU *-ERRM ERROR: LDX #ERRM LDB #ERRML @@ -115,10 +115,10 @@ ELOOP: LDA ,X+ BNE ELOOP FREEZ: BRA FREEZ -TRACK: DB $00,$00 -BUFFER: DB $00,$00 +TRACK: .DB $00,$00 +BUFFER: .DB $00,$00 -ZZZ: EQU $ +ZZZ: EQU * ;----------------------------------------------------------------------------- @@ -298,7 +298,7 @@ LD700: LEAX -1,X RTS LD705: LDA #$80 - DB SKP2 + .DB SKP2 LD708: LDA #$A0 PSHS A LDX #DR0TRK @@ -377,14 +377,14 @@ LD798: ANDCC #$AF STA DCSTA RTS -LD7A2: DW LD6C5 - DW LD6DD - DW LD705 - DW LD708 +LD7A2: .DW LD6C5 + .DW LD6DD + .DW LD705 + .DW LD708 -LD7AA: DB 1 - DB 2 - DB 4 - DB $40 +LD7AA: .DB 1 + .DB 2 + .DB 4 + .DB $40 END diff --git a/bugger.src b/bugger.src index d5579464da98..c90abf6e8144 100644 --- a/bugger.src +++ b/bugger.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- DEBUGGER ---" + ;SBTTL "--- DEBUGGER ---" ; -------- ; DEBUGGER @@ -120,5 +120,5 @@ IH1: ADDA #$30 POOP: STA ,X+ RTS - END + ;END diff --git a/cocozip.src b/cocozip.src index 6f7d238dd687..6e96a957c51f 100644 --- a/cocozip.src +++ b/cocozip.src @@ -1,4 +1,4 @@ - TITLE "ZIP/6809-C INFOCOM, INC. --- INITIALIZATION" + ;TITLE "ZIP/6809-C INFOCOM, INC. --- INITIALIZATION" ; ------------------------------- ; ZIP/6809 VERSION C @@ -35,34 +35,34 @@ DEBUG EQU 0 ; ASSEMBLY FLAG ; 16 -- ZIP NOT FULLY LOADED - INCLUD EQ.ASM - INCLUD WARM.ASM + INCLUDE zequates.src + INCLUDE warm.src - TITLE "ZIP/6809-B INFOCOM, INC. --- MAINLINE" - INCLUD MAIN.ASM - INCLUD SUBS.ASM - INCLUD DISPATCH.ASM + ;TITLE "ZIP/6809-B INFOCOM, INC. --- MAINLINE" + INCLUDE main.src + INCLUDE mainsubs.src + INCLUDE dispatch.src - TITLE "ZIP/6809-B INFOCOM, INC. --- OPCODE EXECUTORS" - INCLUD OPS0.ASM - INCLUD OPS1.ASM - INCLUD OPS2.ASM - INCLUD OPSX.ASM - INCLUD READ.ASM + ;TITLE "ZIP/6809-B INFOCOM, INC. --- OPCODE EXECUTORS" + INCLUDE ops0.src + INCLUDE ops1.src + INCLUDE ops2.src + INCLUDE opsx.src + INCLUDE read.src - TITLE "ZIP/6809-B INFOCOM, INC. --- OPCODE SUPPORT" - INCLUD PAGING.ASM - INCLUD ZSTRING.ASM - INCLUD OBJECTS.ASM + ;TITLE "ZIP/6809-B INFOCOM, INC. --- OPCODE SUPPORT" + INCLUDE paging.src + INCLUDE zstring.src + INCLUDE objects.src - TITLE "ZIP/6809-B INFOCOM, INC. --- COCO MACHINE DEPENDENT" - INCLUD IO.ASM - INCLUD SCREEN.ASM - INCLUD DISK.ASM + ;TITLE "ZIP/6809-B INFOCOM, INC. --- COCO MACHINE DEPENDENT" + INCLUDE ioprims.src + INCLUDE screen.src + INCLUDE disk.src - TITLE "ZIP/6809-B INFOCOM, INC." + ;TITLE "ZIP/6809-B INFOCOM, INC." IF DEBUG - INCLUD BUGGER.ASM + INCLUDE bugger.src ENDIF END diff --git a/disk.src b/disk.src index fd8aac2c9f95..a8456328bded 100644 --- a/disk.src +++ b/disk.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- DISK I/O ---" + ;SBTTL "--- DISK I/O ---" DSKCON EQU $C004 ; CONTAINS DISK ACCESS VECTOR DCB EQU $EA ; ADDRESS OF DCB @@ -394,57 +394,57 @@ TIONP: LDX #PTION ; TEXT FOR SAVE/RESTORE ; --------------------- -RES: DB "RESTORE" -RESL EQU $-RES +RES: .STR "RESTORE" +RESL EQU *-RES -SAV: DB "SAVE" -SAVL EQU $-SAV +SAV: .STR "SAVE" +SAVL EQU *-SAV -INSERM: DB EOL - DB EOL - DB "INSERT SAVE DISK IN DRIVE " -GAMDRI: DB "0." - DB EOL -INSERML EQU $-INSERM +INSERM: .DB EOL + .DB EOL + .STR "INSERT SAVE DISK IN DRIVE " +GAMDRI: .STR "0." + .DB EOL +INSERML EQU *-INSERM -GAME: DB EOL - DB "INSERT STORY DISK IN DRIVE 0." - DB EOL -GAMEL EQU $-GAME +GAME: .DB EOL + .STR "INSERT STORY DISK IN DRIVE 0." + .DB EOL +GAMEL EQU *-GAME -PRESS: DB "PRESS TO CONTINUE." - DB EOL - DB ">" -PRESSL EQU $-PRESS +PRESS: .STR "PRESS TO CONTINUE." + .DB EOL + .STR ">" +PRESSL EQU *-PRESS -POSIT: DB " POSITION" - DB EOL - DB EOL - DB "POSITION 1-7 " -POSITL EQU $-POSIT +POSIT: .STR " POSITION" + .DB EOL + .DB EOL + .STR "POSITION 1-7 " +POSITL EQU *-POSIT -WDRIV: DB EOL - DB "DRIVE 0 OR 1 " -WDRIVL EQU $-WDRIV +WDRIV: .DB EOL + .STR "DRIVE 0 OR 1 " +WDRIVL EQU *-WDRIV -DEFALT: DB "(DEFAULT IS " -DEFNUM: DB "0) >" -DEFALL EQU $-DEFALT +DEFALT: .STR "(DEFAULT IS " +DEFNUM: .STR "0) >" +DEFALL EQU *-DEFALT -SING: DB EOL - DB "SAVING" -SINGL EQU $-SING +SING: .DB EOL + .STR "SAVING" +SINGL EQU *-SING -RING: DB EOL - DB "RESTORING" -RINGL EQU $-RING +RING: .DB EOL + .STR "RESTORING" +RINGL EQU *-RING -PTION: DB " POSITION " -PDO: DB "1 ..." - DB EOL -PTIONL EQU $-PTION +PTION: .STR " POSITION " +PDO: .STR "1 ..." + .DB EOL +PTIONL EQU *-PTION -ENDTST: DB "END" +ENDTST: .STR "END" - END + ;END diff --git a/dispatch.src b/dispatch.src index a56870a374ac..966ca71f66c8 100644 --- a/dispatch.src +++ b/dispatch.src @@ -1,92 +1,92 @@ PAGE - SBTTL "--- OPCODE DISPATCH TABLES ---" + ;SBTTL "--- OPCODE DISPATCH TABLES ---" ; 0-OPS -OPT0: DW ZRTRUE ; 0 - DW ZRFALS ; 1 - DW ZPRI ; 2 - DW ZPRR ; 3 - DW ZNOOP ; 4 - DW ZSAVE ; 5 - DW ZREST ; 6 - DW ZSTART ; 7 - DW ZRSTAK ; 8 - DW POPSTK ; 9 - DW ZQUIT ; 10 - DW ZCRLF ; 11 - DW ZUSL ; 12 - DW ZVER ; 13 +OPT0: .DW ZRTRUE ; 0 + .DW ZRFALS ; 1 + .DW ZPRI ; 2 + .DW ZPRR ; 3 + .DW ZNOOP ; 4 + .DW ZSAVE ; 5 + .DW ZREST ; 6 + .DW ZSTART ; 7 + .DW ZRSTAK ; 8 + .DW POPSTK ; 9 + .DW ZQUIT ; 10 + .DW ZCRLF ; 11 + .DW ZUSL ; 12 + .DW ZVER ; 13 NOPS0 EQU 14 ; NUMBER OF 0-OPS ; 1-OPS -OPT1: DW ZZERO ; 0 - DW ZNEXT ; 1 - DW ZFIRST ; 2 - DW ZLOC ; 3 - DW ZPTSIZ ; 4 - DW ZINC ; 5 - DW ZDEC ; 6 - DW ZPRB ; 7 - DW BADOP1 ; 8 (UNDEFINED) - DW ZREMOV ; 9 - DW ZPRD ; 10 - DW ZRET ; 11 - DW ZJUMP ; 12 - DW ZPRINT ; 13 - DW ZVALUE ; 14 - DW ZBCOM ; 15 +OPT1: .DW ZZERO ; 0 + .DW ZNEXT ; 1 + .DW ZFIRST ; 2 + .DW ZLOC ; 3 + .DW ZPTSIZ ; 4 + .DW ZINC ; 5 + .DW ZDEC ; 6 + .DW ZPRB ; 7 + .DW BADOP1 ; 8 (UNDEFINED) + .DW ZREMOV ; 9 + .DW ZPRD ; 10 + .DW ZRET ; 11 + .DW ZJUMP ; 12 + .DW ZPRINT ; 13 + .DW ZVALUE ; 14 + .DW ZBCOM ; 15 NOPS1 EQU 16 ; NUMBER OF 1-OPS ; 2-OPS -OPT2: DW BADOP2 ; 0 (UNDEFINED) - DW ZEQUAL ; 1 - DW ZLESS ; 2 - DW ZGRTR ; 3 - DW ZDLESS ; 4 - DW ZIGRTR ; 5 - DW ZIN ; 6 - DW ZBTST ; 7 - DW ZBOR ; 8 - DW ZBAND ; 9 - DW ZFSETP ; 10 - DW ZFSET ; 11 - DW ZFCLR ; 12 - DW ZSET ; 13 - DW ZMOVE ; 14 - DW ZGET ; 15 - DW ZGETB ; 16 - DW ZGETP ; 17 - DW ZGETPT ; 18 - DW ZNEXTP ; 19 - DW ZADD ; 20 - DW ZSUB ; 21 - DW ZMUL ; 22 - DW ZDIV ; 23 - DW ZMOD ; 24 +OPT2: .DW BADOP2 ; 0 (UNDEFINED) + .DW ZEQUAL ; 1 + .DW ZLESS ; 2 + .DW ZGRTR ; 3 + .DW ZDLESS ; 4 + .DW ZIGRTR ; 5 + .DW ZIN ; 6 + .DW ZBTST ; 7 + .DW ZBOR ; 8 + .DW ZBAND ; 9 + .DW ZFSETP ; 10 + .DW ZFSET ; 11 + .DW ZFCLR ; 12 + .DW ZSET ; 13 + .DW ZMOVE ; 14 + .DW ZGET ; 15 + .DW ZGETB ; 16 + .DW ZGETP ; 17 + .DW ZGETPT ; 18 + .DW ZNEXTP ; 19 + .DW ZADD ; 20 + .DW ZSUB ; 21 + .DW ZMUL ; 22 + .DW ZDIV ; 23 + .DW ZMOD ; 24 NOPS2 EQU 25 ; NUMBER OF 2-OPS ; X-OPS -OPTX: DW ZCALL ; 0 - DW ZPUT ; 1 - DW ZPUTB ; 2 - DW ZPUTP ; 3 - DW ZREAD ; 4 - DW ZPRC ; 5 - DW ZPRN ; 6 - DW ZRAND ; 7 - DW ZPUSH ; 8 - DW ZPOP ; 9 - DW ZSPLIT ; 10 - DW ZSCRN ; 11 +OPTX: .DW ZCALL ; 0 + .DW ZPUT ; 1 + .DW ZPUTB ; 2 + .DW ZPUTP ; 3 + .DW ZREAD ; 4 + .DW ZPRC ; 5 + .DW ZPRN ; 6 + .DW ZRAND ; 7 + .DW ZPUSH ; 8 + .DW ZPOP ; 9 + .DW ZSPLIT ; 10 + .DW ZSCRN ; 11 NOPSX EQU 12 ; NUMBER OF X-OPS - END + ;END diff --git a/ioprims.src b/ioprims.src index 30766fb2088e..8722f6acb996 100644 --- a/ioprims.src +++ b/ioprims.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- OS EQUATES ---" + ;SBTTL "--- OS EQUATES ---" SCREEN EQU $400 ; START OF SCREEN RAM ENDSCR EQU $600 ; END OF SCREEN RAM @@ -22,7 +22,7 @@ BFREQ EQU 500 ; FREQUENCY OF RAZZ FLASH EQU $180 ; CURSOR BLINK FREQUENCY PAGE - SBTTL "I/O PRIMITIVES" + ;SBTTL "I/O PRIMITIVES" ; ------------------ ; ENABLE ROM FOR I/O @@ -252,7 +252,7 @@ INPEX: CLR DEVNUM ; POINT BACK TO SCREEN LDA BINDEX ; RETRIEVE # CHARS IN LINE RTS -SFLAG DB 0 ; FLAG TO SAVE SCRIPT STATE +SFLAG .DB 0 ; FLAG TO SAVE SCRIPT STATE ; JMP ROMOUT ; MAKE SURE ROM IS GONE [ASK 5/15/85] @@ -554,17 +554,17 @@ LA263: ASLB LA269: LDB B,X BRA LA20B -CONTAB: DB $5E,$5F - DB $A,$5B - DB $8,$15 - DB $9,$5D - DB $20,$20 - DB $30,$12 +CONTAB: .DB $5E,$5F + .DB $A,$5B + .DB $8,$15 + .DB $9,$5D + .DB $20,$20 + .DB $30,$12 - DB $D,$D - DB $C,$5C - DB $3,$3 - DB $40,$13 + .DB $D,$D + .DB $C,$5C + .DB $3,$3 + .DB $40,$13 LA7D1: LDX ZERO LA7D3: LEAX -1,X @@ -629,7 +629,7 @@ LA2FB: LDB #2 LA2FD: STB DA ;$FF20 BSR LA302 LA302: LDX LPTBTD - DB SKP2 + .DB SKP2 LA305: LDX LPTLND JMP LA7D3 @@ -765,7 +765,7 @@ LD700: LEAX -1,X RTS LD705: LDA #$80 - DB SKP2 + .DB SKP2 LD708: LDA #$A0 PSHS A LDX #DR0TRK @@ -844,16 +844,16 @@ LD798: ANDCC #$AF STA DCSTA RTS -LD7A2: DW LD6C5 - DW LD6DD - DW LD705 - DW LD708 +LD7A2: .DW LD6C5 + .DW LD6DD + .DW LD705 + .DW LD708 -LD7AA: DB 1 - DB 2 - DB 4 - DB $40 +LD7AA: .DB 1 + .DB 2 + .DB 4 + .DB $40 - END + ;END diff --git a/main.src b/main.src index f6d614ebb0d8..bd337891a849 100644 --- a/main.src +++ b/main.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- MAIN LOOP ---" + ;SBTTL "--- MAIN LOOP ---" MLOOP: JSR ROMOUT ; FOR SAFETY DEC RAND2 ; RANDOMNESS @@ -168,5 +168,5 @@ OP2EX: LDX #OPT2 ; ADDR OF 2-OP DISPATCH TABLE BADOP2: LDA #4 JSR ZERROR - END + ;END diff --git a/mainsubs.src b/mainsubs.src index 0716eb783a91..a63500e5a3dd 100644 --- a/mainsubs.src +++ b/mainsubs.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- MAIN LOOP SUPPORT ---" + ;SBTTL "--- MAIN LOOP SUPPORT ---" ; ----------------------- ; FETCH A SHORT IMMEDIATE @@ -237,5 +237,5 @@ PDB0: STA ZPCL ; LOW-BYTES CALCED CLR ZPCFLG ; CHANGED PAGES PDB1: RTS - END + ;END diff --git a/objects.src b/objects.src index 2c0bdc2eacff..d219fe82de01 100644 --- a/objects.src +++ b/objects.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- OBJECT & PROPERTY HANDLERS ---" + ;SBTTL "--- OBJECT & PROPERTY HANDLERS ---" PROPB: LDA ARG1+1 JSR OBJLOC @@ -73,5 +73,5 @@ OBJLOC: LDB #9 ; NUMBER IN [A] TIMES 9 STD TEMP RTS - END + ;END diff --git a/ops0.src b/ops0.src index 86718a3bd2d5..7a18dcd03afd 100644 --- a/ops0.src +++ b/ops0.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- 0-OPS ---" + ;SBTTL "--- 0-OPS ---" ; ----- ; RTRUE @@ -127,5 +127,5 @@ VSUM0: LDD MPCM ; END OF GAME YET? LBEQ PREDS ; YES, PREDICATE SUCCEEDS JMP PREDF ; ELSE FAILURE ... - END + ;END diff --git a/ops1.src b/ops1.src index 8ad5c908468c..16d840c4a0e6 100644 --- a/ops1.src +++ b/ops1.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- 1-OPS ---" + ;SBTTL "--- 1-OPS ---" ; ----- ; ZERO? @@ -270,5 +270,5 @@ ZBCOM: LDD ARG1 ; GRAB ARGUMENT STD TEMP ; AND PASS TO PUTVAL JMP PUTVAL - END + ;END diff --git a/ops2.src b/ops2.src index 1e12605e539d..48642872b933 100644 --- a/ops2.src +++ b/ops2.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- 2-OPS ---" + ;SBTTL "--- 2-OPS ---" ; ----- ; LESS? @@ -496,5 +496,5 @@ DECX: LEAX -1,X DIVERR: LDA #8 JSR ZERROR - END + ;END diff --git a/opsx.src b/opsx.src index 85056c37efb9..5827f675663f 100644 --- a/opsx.src +++ b/opsx.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- X-OPS ---" + ;SBTTL "--- X-OPS ---" ; ------ ; EQUAL? @@ -282,5 +282,5 @@ ZSPLIT EQU ZNOOP ZSCRN EQU ZNOOP - END + ;END diff --git a/paging.src b/paging.src index 36d5b47d83ac..5b6ef39572b5 100644 --- a/paging.src +++ b/paging.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- TIMESTAMP PAGING ROUTINES (BM 11/24/84) ---" + ;SBTTL "--- TIMESTAMP PAGING ROUTINES (BM 11/24/84) ---" ; -------------------- ; FETCH A VIRTUAL WORD @@ -27,7 +27,7 @@ NEXTPC: TST ZPCFLG ; IS [ZPCPNT] VALID? CMPB ZPURE ; IS THIS PAGE PRELOADED? BHS NPC0 ; NO, SWAP IT IN - ADDB #HIGH ZCODE ; ELSE MAKE IT ABSOLUTE + ADDB #(ZCODE/256) ; ELSE MAKE IT ABSOLUTE BRA NPC1 ; AND CONTINUE NPC0: CLR MPCFLG ; INVALIDATE [MPC] FOR SAFETY @@ -66,12 +66,12 @@ GETBYT: TST MPCFLG ; IS [MPCPNT] VALID? TSTA ; IS TOP BIT CLEAR? BNE GTBT0 ; NO, PAGE MUST BE SWAPPED -PATCH EQU $+1 ; PATCH POINT FOR "VERIFY" +PATCH EQU *+1 ; PATCH POINT FOR "VERIFY" CMPB ZPURE ; IS THIS PAGE PRELOADED? BHS GTBT0 ; NO, SWAP IT IN - ADDB #HIGH ZCODE ; ELSE MAKE IT ABSOLUTE + ADDB #(ZCODE/256) ; ELSE MAKE IT ABSOLUTE BRA GTBT1 ; AND CONTINUE GTBT0: CLR ZPCFLG ; INVALIDATE [ZPC] FOR SAFETY @@ -208,5 +208,5 @@ SETWRD: LDD TEMP CLR MPCFLG RTS - END + ;END diff --git a/read.src b/read.src index 0bbf2647c8c2..d8c2546f1cbe 100644 --- a/read.src +++ b/read.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- READ HANDLER ---" + ;SBTTL "--- READ HANDLER ---" ZREAD: JSR ZUSL ; UPDATE STATUS LINE FIRST @@ -202,11 +202,11 @@ FWSUCC: LEAX -ZCODE,X ; CONVERT TO Z-ADDRESS ; NORMAL BREAK CHARS ; ------------------ -BRKTBL: DB "!?,." - DB EOL - DB SPACE +BRKTBL: .STR "!?,." + .DB EOL + .DB SPACE NBRKS EQU 6 ; # NORMAL BREAK CHARS - END + ;END diff --git a/screen.src b/screen.src index 461737a84017..44b38d9e1ac0 100644 --- a/screen.src +++ b/screen.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- SCREEN & PRINTER I/O ---" + ;SBTTL "--- SCREEN & PRINTER I/O ---" ; ------------ ; RESTART GAME @@ -26,8 +26,8 @@ LUKE: JSR CLS ; A CLEAN SLATE JSR DLINE ; "LOADING GAME ..." JMP START ; AND DO A WARMSTART -LOADM: DB "THE STORY IS LOADING ..." -LOADML EQU $-LOADM +LOADM: .STR "THE STORY IS LOADING ..." +LOADML EQU *-LOADM ; ----- ; ERROR @@ -35,9 +35,9 @@ LOADML EQU $-LOADM ; ENTRY: ERROR CODE # IN [A] -INTERR: DB EOL - DB "INTERNAL ERROR #" -IERRL EQU $-INTERR +INTERR: .DB EOL + .STR "INTERNAL ERROR #" +IERRL EQU *-INTERR ZERROR: PSHS A ; SAVE CODE # JSR ZCRLF ; FLUSH BUFFER @@ -65,17 +65,17 @@ ZQUIT: LDX #ENDSES FREEZE: BRA FREEZE ; STOP DEAD -ENDSES: DB "END OF SESSION" -VCODE: DB EOL ; SHARED EOL CHAR -ENDSL EQU $-ENDSES +ENDSES: .STR "END OF SESSION" +VCODE: .DB EOL ; SHARED EOL CHAR +ENDSL EQU *-ENDSES ; -------------------------- ; DISPLAY ZIP VERSION NUMBER ; -------------------------- - DB "COCO 2 VERSION C" - DB EOL -VCODEL EQU $-VCODE + .STR "COCO 2 VERSION C" + .DB EOL +VCODEL EQU *-VCODE VERNUM: LDX #VCODE LDB #VCODEL @@ -126,8 +126,8 @@ FLUSH4: LDX #BUFFER ; POINT TO BUFFER INC CHRPNT ; NEXT POSITION BRA FLUSH3 ; KEEP MOVING -MORES: DB "[more]" -MOREL EQU $-MORES +MORES: .STR "[more]" +MOREL EQU *-MORES ; --------------- ; CARRIAGE RETURN @@ -318,5 +318,5 @@ REVERS: LDA ,X BLO REVERS RTS - END + ;END diff --git a/warm.src b/warm.src index 8cff27bb8467..610ae709c7e2 100644 --- a/warm.src +++ b/warm.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- WARMSTART ROUTINE ---" + ;SBTTL "--- WARMSTART ROUTINE ---" SETDP 0 ORG ZIP ; START OF EXECUTABLE CODE @@ -37,9 +37,9 @@ TSTEND: LDA ENDTST-1,X BNE TSTEND BRA ENDOK ENDERR: LDA #16 - JMP ZERROR; + JMP ZERROR ; -ENDCMP: DB "END" +ENDCMP: FCC "END" ; CLEAR ALL DIRECT-PAGE VARIABLES @@ -76,7 +76,7 @@ ST1B: CLR ,X+ LDA ZCODE+ZENDLD ; GET MSB OF ENDLOAD POINTER INCA ; ADD ONE TO GET STA ZPURE ; 1ST PAGE IN "PURE" CODE - ADDA #HIGH ZCODE ; ADD BASE ADDRESS TO GET + ADDA #(ZCODE/256) ; ADD BASE ADDRESS TO GET STA PAGE0 ; 1ST PAGE OF SWAPPING SPACE LDB #MEMTOP ; TOP PAGE OF MEMORY @@ -141,5 +141,5 @@ LDPRE: JSR GETDSK ; GRAB THE BLOCK ; FALL INTO MAIN LOOP - END + ;END diff --git a/zequates.src b/zequates.src index c9c7db484849..fb7b3f34492d 100644 --- a/zequates.src +++ b/zequates.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- MEMORY ORGANIZATION ---" + ;SBTTL "--- MEMORY ORGANIZATION ---" TRUE EQU $FF FALSE EQU 0 @@ -37,7 +37,7 @@ ZLENTH EQU 26 ; LENGTH OF Z-PROGRAM IN WORDS ZCHKSM EQU 28 ; Z-CODE CHECKSUM WORD PAGE - SBTTL "--- ZIP D-PAGE VARIABLES ---" + ;SBTTL "--- ZIP D-PAGE VARIABLES ---" OPCODE EQU DSTART ; CURRENT OPCODE ARGCNT EQU OPCODE+1 ; # ARGUMENTS @@ -118,5 +118,5 @@ TDRIVE EQU CHRPNT+16 ; TEMP GAME DRIVE ZPGTOP EQU CHRPNT+15 ; END OF DIRECT-PAGE VARIABLES - END + ;END diff --git a/zstring.src b/zstring.src index e0c05dcb0afe..156e55f6da1c 100644 --- a/zstring.src +++ b/zstring.src @@ -1,5 +1,5 @@ PAGE - SBTTL "--- Z-STRING HANDLERS ---" + ;SBTTL "--- Z-STRING HANDLERS ---" ; ----------------- ; POINT TO Z-STRING @@ -355,12 +355,12 @@ CNZSLE: LDD ZSTBUO ; HANDLE 1ST TRIPLET ; CHARSET 2 DECODE TABLE ; ---------------------- -CHRTBL: DB 0 ; DUMMY BYTE - DB $0D ; CARRIAGE RETURN - DB "0123456789.,!?_#" - DB $27 ; SINGLE QUOTE - DB $22 ; DOUBLE QUOTE - DB "/\-:()" +CHRTBL: .DB 0 ; DUMMY BYTE + .DB $0D ; CARRIAGE RETURN + .STR "0123456789.,!?_#" + .DB $27 ; SINGLE QUOTE + .DB $22 ; DOUBLE QUOTE + .STR "/\-:()" - END + ;END -- 2.13.6