Fix incorrect border colour setting on X16. Remove custom font on Quit on X16.

Author: fredrikr

asm/ozmoo.asm

@@ -1133,6 +1133,12 @@ game_id		!byte 0,0,0,0
 	jmp basic_reset
 } else ifdef TARGET_X16 {
 !ifdef TARGET_X16 {
+	!ifdef CUSTOM_FONT {
+		lda #2
+		jsr $ff62
+	}
+    lda #$09 ; Unlock font selection
+    jsr $ffd2
 	jmp x16_restore_basic_zp
 }
 	; stz 1
@@ -1898,9 +1904,9 @@ deletable_init_start
 }
 
 !ifdef TARGET_X16 {
-    lda #$0e
+    lda #$0e ; Set font = lower case / upper case
     jsr $ffd2
-    lda #$08
+    lda #$08 ; Lock font selection
     jsr $ffd2
 }
 !ifdef TARGET_PLUS4 {

asm/screenkernal.asm

@@ -169,13 +169,15 @@ VERASetBorderColour
     rts
 
 VERASetBackgroundColour
+	pha
     asl
     asl
     asl
     asl
     sta .vera_background
 	ora s_colour
 	sta vera_composite_colour
+	pla
     rts
 
 VERASetForegroundColour

make.rb

@@ -57,7 +57,7 @@
 if $settings_file.empty? && File.exists?(Dir.home + '/.ozmoorc') then
     $settings_file = Dir.home + '/.ozmoorc'
 end
-if ! $settings_file.empty?
+unless $settings_file.empty?
 	File.foreach $settings_file do |line|
 		if line =~ /^\s*'?(\w+)'?\s*=>?(.*)/ then
 			name = $1.upcase
@@ -2505,6 +2505,8 @@ def print_usage
 	exit 1
 end
 
+puts "Using settings file #{$settings_file}" if $verbose and ! $settings_file.empty?
+
 if $target =~ /^c(64|128)$/ and reu_boost == nil
 	reu_boost = 1
 end

releasenotes.txt

@@ -18,6 +18,8 @@ Bugfixes:
 - Restart loaded entire story file on MEGA65, if a custom font was used
 - A conditional jump in the code could break because it had to jump too far, if you had smooth scroll, scrollback buffer and undo enabled.
 - A scrollback buffer in regular RAM made Beyond Zork builds break
+- Border colour was sometimes set incorrectly on X16
+- Using a custom font on X16 made the font stay after QUIT
 
 ================================================
 Release 14.7: 2 April 2024

version.txt

@@ -1 +1 @@
-14.13
+14.14