diff --git a/defines_apple.s b/defines_apple.s index d411605..8e9c718 100644 --- a/defines_apple.s +++ b/defines_apple.s @@ -27,6 +27,7 @@ STACK_TOP := $F8 SPACE_FOR_GOSUB := $36 CRLF_1 := CR CRLF_2 := $80 +WIDTH := 40 ; memory layout RAMSTART2 := $2A00 diff --git a/defines_kim.s b/defines_kim.s index 7c09743..4954a61 100644 --- a/defines_kim.s +++ b/defines_kim.s @@ -19,6 +19,7 @@ ZP_START2 = $63 STACK_TOP := $FC SPACE_FOR_GOSUB := $36 NULL_MAX := $F2 ; probably different in original version; the image I have seems to be modified; see PDF +WIDTH := 72 ; magic memory locations L1800 := $1800 diff --git a/defines_microtan.s b/defines_microtan.s index 2f04ebc..09fffa1 100644 --- a/defines_microtan.s +++ b/defines_microtan.s @@ -23,7 +23,7 @@ TXPSV := $00BA STACK_TOP := $FE SPACE_FOR_GOSUB := $3E NULL_MAX := $F0 - +WIDTH := 80 ; memory layout RAMSTART2 := $0400 diff --git a/defines_osi.s b/defines_osi.s index b2efaf6..ac23e1c 100644 --- a/defines_osi.s +++ b/defines_osi.s @@ -20,6 +20,7 @@ USR := $000A STACK_TOP := $FC SPACE_FOR_GOSUB := $33 NULL_MAX := $0A +WIDTH := 72 ; memory layout RAMSTART2 := $0300 diff --git a/init.s b/init.s index db8252f..dc52ca2 100644 --- a/init.s +++ b/init.s @@ -59,7 +59,7 @@ COLD_START2: sta GOSTROUT sta JMPADRS .endif - .if .def(CONFIG_SMALL) || .def(MICROTAN) || .def(APPLE) + .if (!.def(CONFIG_RAM)) && (!.def(CONFIG_CBM_ALL)) sta USR .endif @@ -75,20 +75,12 @@ COLD_START2: sty USR+2 .endif .ifndef CONFIG_CBM_ALL - .ifdef APPLE - lda #$28 - .else - .ifdef MICROTAN - lda #$50 - .else - lda #$48 - .endif - .endif + lda #WIDTH sta Z17 .ifdef APPLE - lda #$0E + lda #14 .else - lda #$38 + lda #56 .endif sta Z18 .endif