Fixed errors in colour handling. Added option -bc to set border colour.

Author: Fredrik Ramsberg

documentation/colours.txt

@@ -10,6 +10,11 @@ make.rb has the following switches to control colours:
 
 -sc:(Statusline colour)
 	Statusline colour: This picks the Z-code colour to use as statusline colour. This is only possible with version 3 story files (z3).
+
+-bc:(Border colour)
+	Border colour. This picks the Z-code colour to use as border colour. 
+	Special values: 0 = same as background colour (default), 1 = same as foreground colour. If the game itself changes the screen colours,
+	as it may do in Z5+ games, values 0 and 1 mean the border changes too.
 
 Z-code has a palette of 8 colours, numbered 2-9:
 

make.rb

@@ -385,6 +385,9 @@ def build_interpreter()
 	unless $default_colours.empty? # or $zcode_version >= 5
 		colourflags += " -DBGCOL=#{$default_colours[0]} -DFGCOL=#{$default_colours[1]}"
 	end
+	if $border_colour
+		colourflags += " -DBORDERCOL=#{$border_colour}"
+	end
 	if $statusline_colour
 		colourflags += " -DSTATCOL=#{$statusline_colour}"
 	end
@@ -830,20 +833,21 @@ def build_D3(storyname, d64_filename_1, d64_filename_2, d64_filename_3, config_d
 
 
 def print_usage_and_exit
-	puts "Usage: make.rb [-S1|-S2|-D2|-D3|-P] [-p:[n]] [-c <preloadfile>] [-o] [-s] [-x] [-r] [-f <fontfile>] "
-	puts "      [-rc:[n]=[c],[n]=[c]...] [-dc:[n]:[n]] [-sc:[n]] [-sp:[n]] <storyfile>"
+	puts "Usage: make.rb [-S1|-S2|-D2|-D3|-P] [-p:[n]] [-c <preloadfile>] [-o] [-sp:[n]] [-s] [-x] [-r] "
+	puts "      [-f <fontfile>] [-rc:[n]=[c],[n]=[c]...] [-dc:[n]:[n]] [-bc:[n]] [-sc:[n]] <storyfile>"
 	puts "  -S1|-S2|-D2|-D3|-P: specify build mode. Defaults to S1. See docs for details."
 	puts "  -p:[n]: preload a a maximum of n virtual memory blocks to make game faster at start"
 	puts "  -c: read preload config from preloadfile, previously created with -o"
 	puts "  -o: build interpreter in PREOPT (preload optimization) mode. See docs for details."
+	puts "  -sp: Use the specified number of pages for stack (2-9, default is 4)."
 	puts "  -s: start game in Vice if build succeeds"
 	puts "  -x: Use extended tracks (40 instead of 35) on 1541 disk"
 	puts "  -r: Use reduced amount of RAM (-$CFFF). Only with -P."
 	puts "  -f: Embed the specified font with the game. See docs for details."
 	puts "  -rc: Replace the specified Z-code colours with the specified C64 colours. See docs for details."
 	puts "  -dc: Use the specified background and foreground colours. See docs for details."
+	puts "  -bc: Use the specified border colour. 0=same as bg, 1=same as fg. See docs for details."
 	puts "  -sc: Use the specified status line colour. Only valid for Z3 games. See docs for details."
-	puts "  -sp: Use the specified number of pages for stack (2-9, default is 4)."
 	puts "  storyfile: path optional (e.g. infocom/zork1.z3)"
 	exit 0
 end
@@ -865,6 +869,7 @@ def print_usage_and_exit
 $default_colours = []
 $statusline_colour = nil
 $stack_pages = 4 # Should normally be 2-6. Use 4 unless you have a good reason not to.
+$border_colour = 0
 
 begin
 	while i < ARGV.length
@@ -899,6 +904,8 @@ def print_usage_and_exit
 			$colour_replacements = $1.split(/,/)
 		elsif ARGV[i] =~ /^-dc:([2-9]):([2-9])$/ then
 			$default_colours = [$1.to_i,$2.to_i]
+		elsif ARGV[i] =~ /^-bc:([0-9])$/ then
+			$border_colour = $1.to_i
 		elsif ARGV[i] =~ /^-sc:([2-9])$/ then
 			$statusline_colour = $1.to_i
 		elsif ARGV[i] =~ /^-sp:([2-9])$/ then

ozmoo.asm

@@ -79,11 +79,23 @@
 	FGCOL = 9
 }
 
+; Border color: 0 = as background, 1 = as foreground, 2-9: specified Z-code colour. Default: as background
+!ifndef BORDERCOL {
+	BORDERCOL = 0
+}
+!if BORDERCOL = 0 {
+	BORDER_LIKE_BG = 1
+}
+!if BORDERCOL = 1 {
+	BORDER_LIKE_FG = 1
+}
+
 !ifndef STATCOL {
 	STATCOL = FGCOL
 }
 
 
+
 ;  * = $0801 ; This must now be set on command line: --setpc $0801
 
 program_start
@@ -325,7 +337,7 @@ z_init
 !ifdef Z4PLUS {
 	lda #8
 	sta story_start + $1e ; Interpreter number (8 = C64)
-	lda #64
+	lda #65
 	sta story_start + $1f ; Interpreter number. Usually ASCII code for a capital letter (We use @ until the terp is ready for release)
 	lda #25
 	sta story_start + $20 ; Screen lines

screen.asm

@@ -14,13 +14,21 @@ init_screen_colours_invisible
 init_screen_colours
     jsr s_init
 	ldx zcolours + FGCOL
-	stx $d020
+!ifdef BORDER_LIKE_FG {
+	stx reg_bordercolour
+}
     lda colours,x ; Load control character to switch to background colour
 +	jsr s_printchar
-    ; lda #$0f
-    ; sta $d020
     lda zcolours + BGCOL
-    sta $d021
+    sta reg_backgroundcolour
+!ifdef BORDER_LIKE_BG {
+	sta reg_bordercolour
+} else {
+!ifndef BORDER_LIKE_FG {
+	lda zcolours + BORDERCOL
+	sta reg_bordercolour
+}
+}
 !ifdef Z5PLUS {
     ; store default colours in header
     lda #BGCOL ; blue

screenkernal.asm

@@ -283,10 +283,10 @@ s_erase_line
 .stored_x !byte 0
 .stored_y !byte 0
 .current_screenpos_row !byte $ff
-colours  !byte 144,5,28,159,156,30,31,158,129,149,150,151,152,153,154,155
-zcolours !byte $ff,$ff ; current/default colour
-          !byte COL2,COL3,COL4,COL5  ; black, red, green, yellow
-          !byte COL6,COL7,COL8,COL9  ; blue, magenta, cyan, white
+colours		!byte 144,5,28,159,156,30,31,158,129,149,150,151,152,153,154,155
+zcolours	!byte $ff,$ff ; current/default colour
+			!byte COL2,COL3,COL4,COL5  ; black, red, green, yellow
+			!byte COL6,COL7,COL8,COL9  ; blue, magenta, cyan, white
 
 !ifdef Z5PLUS {
 z_ins_set_colour
@@ -297,17 +297,25 @@ z_ins_set_colour
 	beq .current_foreground
     lda zcolours,x
     bpl +
-    lda story_start + header_default_fg_colour ; default colour
+    ldx story_start + header_default_fg_colour ; default colour
+    lda zcolours,x
 +   tax
+!ifdef BORDER_LIKE_FG {
+	sta reg_bordercolour
+}
     lda colours,x ; get pet ascii for this colour
     jsr s_printchar ; change foreground colour
 .current_foreground
     ldx z_operand_value_low_arr + 1
 	beq .current_background
     lda zcolours,x
     bpl +
-    lda story_start + header_default_bg_colour ; default colour
-+   sta $d021
+    ldx story_start + header_default_bg_colour ; default colour
+    lda zcolours,x
++   sta reg_backgroundcolour
+!ifdef BORDER_LIKE_BG {
+	sta reg_bordercolour
+}
 .current_background
     rts
 }