From aa9a7ffcb503403b9e33c7184d84697a3656b108 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Wed, 7 Oct 2020 18:29:59 +0200
Subject: [PATCH] small tweaks

---
 bin/README.md                           |  3 +++
 src/basic/assets/startup_banner.s       | 26 +++++++++++++++----------
 src/basic/init/initmsg_real.s           |  6 +++---
 src/dos_m65/sdcard/sdcard_readsector.s  |  1 -
 src/dos_m65/sdcard/sdcard_writesector.s | 20 ++++++++++++++++++-
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/bin/README.md b/bin/README.md
index 11d7e890..9c4bb983 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -14,14 +14,17 @@ Follow these rules, or bad things will happen!
 
 * The generic ROM set should be compatible with any C64-compatible machine; platform-specific ROMs might not work on other platforms.
 
+<br />
 
 For Ultimate 64 the following settinghs are recommended:
 
 * U64 Specific Settings -> Turbo Control -> U64 Turbo Registers
 
+<br />
 
 Have fun!
 
+<br />
 
 ------
 
diff --git a/src/basic/assets/startup_banner.s b/src/basic/assets/startup_banner.s
index 26e20ccb..ecc667c4 100644
--- a/src/basic/assets/startup_banner.s
+++ b/src/basic/assets/startup_banner.s
@@ -39,25 +39,31 @@ rainbow_logo:
 
 	!set SET_COLOR_0 = $05
 	!set SET_COLOR_1 = $1C
-	!set SET_COLOR_2 = $9E
-	!set SET_COLOR_3 = $1E
-	!set SET_COLOR_4 = $9F
+	!set SET_COLOR_2 = $81
+	!set SET_COLOR_3 = $9E
+	!set SET_COLOR_4 = $1E
+	!set SET_COLOR_5 = $9F
 
 !ifdef CONFIG_MB_U64 {
 
-	!byte SET_COLOR_1, $B8, $B8, $B8, $B8, $B8, $B8, $B8, $0D
-    !byte SET_COLOR_2, $B8, $B8, $B8, $B8, $B8, $B8, $B8, $0D
-    !byte SET_COLOR_3, $B8, $B8, $B8, $B8, $B8, $B8, $B8, $0D
-    !byte SET_COLOR_4, $B8, $B8, $B8, $B8, $B8, $B8, $B8, $0D
+	!byte SET_COLOR_1, $B8, $B8, $B8, $B8, $B8, $B8, $0D
+    !byte SET_COLOR_2, $B8, $B8, $B8, $B8, $B8, $B8, $0D
+    !byte SET_COLOR_3, $B8, $B8, $B8, $B8, $B8, $B8, $0D
+    !byte SET_COLOR_4, $B8, $B8, $B8, $B8, $B8, $B8, $0D
+    !byte SET_COLOR_5, $B8, $B8, $B8, $B8, $B8, $B8, $0D
     !byte SET_COLOR_0, $00
 
+    !set BANNER_SPACING = $09
+
 } else {
 
 	!byte SET_COLOR_1, $12, $A4, $A4, $A4, $A4, $A4, $A4, $A4, $0D
-    !byte SET_COLOR_2, $12, $A4, $A4, $A4, $A4, $A4, $A4, $0D
-    !byte SET_COLOR_3, $12, $A4, $A4, $A4, $A4, $A4, $0D
-    !byte SET_COLOR_4, $12, $A4, $A4, $A4, $A4, $92
+    !byte SET_COLOR_3, $12, $A4, $A4, $A4, $A4, $A4, $A4, $0D
+    !byte SET_COLOR_4, $12, $A4, $A4, $A4, $A4, $A4, $0D
+    !byte SET_COLOR_5, $12, $A4, $A4, $A4, $A4, $92
     !byte SET_COLOR_0, $00
+
+    !set BANNER_SPACING = $0A
 }
 
 }
diff --git a/src/basic/init/initmsg_real.s b/src/basic/init/initmsg_real.s
index d3f53ac8..03305aed 100644
--- a/src/basic/init/initmsg_real.s
+++ b/src/basic/init/initmsg_real.s
@@ -60,7 +60,7 @@ initmsg_real:
 	jsr STROUT
 
 	ldx #$00
-	ldy #$0A
+	ldy #BANNER_SPACING
 	jsr plot_set
 
 	lda #<startup_banner
@@ -70,7 +70,7 @@ initmsg_real:
 !ifndef CONFIG_BRAND_CUSTOM {
 
 	ldx #$01
-	ldy #$0A
+	ldy #BANNER_SPACING
 	jsr plot_set
 
 	ldx #IDX__STR_PRE_REV
@@ -87,7 +87,7 @@ initmsg_real:
 } else {
 	ldx #$02
 }
-	ldy #$0A
+	ldy #BANNER_SPACING
 	jsr plot_set
 
 	jsr initmsg_bytes_free
diff --git a/src/dos_m65/sdcard/sdcard_readsector.s b/src/dos_m65/sdcard/sdcard_readsector.s
index 023bf1b8..c2523185 100644
--- a/src/dos_m65/sdcard/sdcard_readsector.s
+++ b/src/dos_m65/sdcard/sdcard_readsector.s
@@ -46,7 +46,6 @@ sdcard_readsector_try_loop:
 	jsr sdcard_wait_ready
 	bcs sdcard_readsector_fail
 
-
 	lda SD_CTL
 	and #$67
 	bne sdcard_readsector_copy_data
diff --git a/src/dos_m65/sdcard/sdcard_writesector.s b/src/dos_m65/sdcard/sdcard_writesector.s
index b355c4b4..833719fe 100644
--- a/src/dos_m65/sdcard/sdcard_writesector.s
+++ b/src/dos_m65/sdcard/sdcard_writesector.s
@@ -81,7 +81,25 @@ sdcard_writesector_verify:
 	; There is a bug in the SD controller; you have to read between writes,
 	; or it gets really upset
 
-	; XXX
+@1:
+	lda SD_CTL
+	and #$03
+	bne @1
+
+	lda #CARD_CMD_READ                 ; $02
+	sta SD_CTL
+
+@2:
+	lda SD_CTL
+	and #$03
+	beq @2
+
+@3:                                    ; XXX deduplicate this ppart
+	lda SD_CTL
+	and #$03
+	bne @3
+
+	; XXX verify - compare buffer