From 2f206dfc91c4092c8e76dae3b168b57be797ad01 Mon Sep 17 00:00:00 2001
From: 4am <a2_4am@sent.com>
Date: Mon, 13 Nov 2023 15:49:31 -0500
Subject: [PATCH] split out branding

---
 src/4cade.branding.a      | 34 +++++++++++++++++++++++++
 src/4cade.init.a          | 53 +++++++++++----------------------------
 src/proboothd/proboothd.a |  2 +-
 3 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 src/4cade.branding.a

diff --git a/src/4cade.branding.a b/src/4cade.branding.a
new file mode 100644
index 000000000..5dd481e51
--- /dev/null
+++ b/src/4cade.branding.a
@@ -0,0 +1,34 @@
+;license:MIT
+;(c) 2018-2023 by 4am
+;
+
+PrintBranding
+         ldy   #9
+-        lda   TOTAL-1,y
+         ora   #$80
+         sta   $04B7-1,y
+         dey
+         bne   -
+         ldy   #11
+-        lda   REPLAY-1,y
+         ora   #$80
+         sta   $0536-1,y
+         dey
+         bne   -
+         rts
+
+TOTAL
+         !text "T O T A L"
+REPLAY
+         !text "R E P L A Y"
+!ifndef RELEASE {
+LoadingVersion
+         !byte 8
+         !text "  build "
+LoadingBuild
+         !word BUILDNUMBER
+} else {
+LoadingVersion
+         !byte 12
+         !text "      v5.0.1"
+}
diff --git a/src/4cade.init.a b/src/4cade.init.a
index 41883350a..0f6543f7d 100755
--- a/src/4cade.init.a
+++ b/src/4cade.init.a
@@ -18,19 +18,20 @@
          jsr   ROM_NORMAL
          jsr   ROM_IN0
          jsr   ROM_PR0
+
+         ; accommodate uppercase-only machines (64K ][ and ][+ are supported)
+         lda   ROM_MACHINEID
+         cmp   #$A0
+         beq   +                     ; Spectrum ED
+         cmp   #$06
+         beq   +
+         lda   #$DF
+         +HIDE_NEXT_2_BYTES
++        lda   #$FF
+         sta   zpCharMask
+
          ; print text title in same place as graphical title will appear
-         ldy   #9
--        lda   TOTAL-1,y
-         ora   #$80
-         sta   $04B7-1,y
-         dey
-         bne   -
-         ldy   #11
--        lda   REPLAY-1,y
-         ora   #$80
-         sta   $0536-1,y
-         dey
-         bne   -
+         jsr   PrintBranding
 
          ; proboothd duplicates the above code and jumps here,
          ; so if you make any changes before this comment, you
@@ -75,17 +76,6 @@
                                      ;     bit 7 = 1 if joystick
                                      ; and all other bits are 0 (we'll set bit 3 after copying it to LC RAM)
 
-         ; accommodate uppercase-only machines (64K ][ and ][+ are supported)
-         lda   ROM_MACHINEID
-         cmp   #$A0
-         beq   +                     ; Spectrum ED
-         cmp   #$06
-         beq   +
-         lda   #$DF
-         +HIDE_NEXT_2_BYTES
-+        lda   #$FF
-         sta   zpCharMask
-
          ; IIgs fix for Alternate Display Mode (clear shadow page 2)
          lda   zpMachineStatus
          and   #IS_IIGS
@@ -297,21 +287,8 @@ FoundMockingboardCallback
          ora   #$B0
          jmp   ROM_COUT
 
-TOTAL
-         !text "T O T A L"
-REPLAY
-         !text "R E P L A Y"
-!ifndef RELEASE {
-LoadingVersion
-         !byte 8
-         !text "  build "
-LoadingBuild
-         !word BUILDNUMBER
-} else {
-LoadingVersion
-         !byte 12
-         !text "      v5.0.1"
-}
+         !src  "src/4cade.branding.a"
+
 Loading64K
          !byte 3
          !text "64K"
diff --git a/src/proboothd/proboothd.a b/src/proboothd/proboothd.a
index 391f45eaa..75b94ad20 100644
--- a/src/proboothd/proboothd.a
+++ b/src/proboothd/proboothd.a
@@ -151,7 +151,7 @@ blockind ldy   $ff
          txa
          bne   readfile
 
-readdone jmp   $203b
+readdone jmp   $2036
 
 seekread stx   bloklo
          sty   blokhi