diff --git a/src/constants.a b/src/constants.a
index 51f31d7bf..098db09fe 100644
--- a/src/constants.a
+++ b/src/constants.a
@@ -7,7 +7,7 @@
 ;
 ; LC RAM BANK 1
 ; D000..E789 - persistent data structures (gGlobalPrefsStore, gGamesListStore)
-; E973..FFF1 - main program code
+; E97B..FFF1 - main program code
 ; FFF2..FFF9 - API functions and global constants available for main program
 ;              code, prelaunchers, transition effects, &c.
 ;              (Wait/UnwaitForVBL, MockingboardStuff, MachineStatus)
@@ -17,7 +17,7 @@
 ; D000..D3FF - ProRWTS data
 ; D400..D66F - ProRWTS code
 ; D670..DB91 - HGR font code & ProRWTS glue code
-; DB60..DB6F - backup of stack (during gameplay and self-running demos)
+; DB5C..DB6B - backup of stack (during gameplay and self-running demos)
 ; ...unused...
 ; DBB4..DBFF - (de)acceleration function
 ; DC00..DFFF - HGR font data
diff --git a/src/ui.attract.dhgr.a b/src/ui.attract.dhgr.a
index db90513fe..fbde66817 100644
--- a/src/ui.attract.dhgr.a
+++ b/src/ui.attract.dhgr.a
@@ -1,4 +1,4 @@
-;license:MIT
+:MIT
 ;(c) 2018-2021 by 4am & qkumba
 ;
 ; Double hi-res slideshows
@@ -295,7 +295,7 @@ DrawGameTitleInActionSlideshow
 ; to display properly on the DHGR screen.
 ;
 ; /!\ must be called immediately after calling one of the font drawing routines
-;     (Draw40Chars, DrawCenteredString, DrawString, DrawBuffer)
+;     (Draw40Chars, DrawCenteredString, DrawString)
 ;
 ; in:    gPathname contains number of bytes to transform
 ;        DBIRow0/LC2 contains address of first byte of first row to transform
diff --git a/src/ui.font.a b/src/ui.font.a
index 5d28cbc8b..c517f28c6 100644
--- a/src/ui.font.a
+++ b/src/ui.font.a
@@ -11,7 +11,6 @@
 ; - Draw40Chars
 ; - DrawCenteredString
 ; - DrawString
-; - DrawBuffer
 ;
 
 DrawString
@@ -35,8 +34,3 @@ DrawCenteredString
          jsr   SwitchToBank2
          jsr   DrawCenteredStringInternal
          bmi   JmpSwitch             ; always
-
-DrawBuffer
-         jsr   SwitchToBank2
-         jsr   DrawBufferInternal
-         bmi   JmpSwitch             ; always
diff --git a/src/ui.font.lc2.a b/src/ui.font.lc2.a
index 6de65743f..b30954fd7 100644
--- a/src/ui.font.lc2.a
+++ b/src/ui.font.lc2.a
@@ -17,32 +17,29 @@ DrawPageInternal
 ; drawing starts at VTAB 0
 ; each line starts at column X which was passed in (0-indexed)
 ; clobbers PTR
-; clobbers $FF
+; clobbers $FE/$FF
 ; clobbers A/X/Y
 ; preserves C, other flags clobbered
          stx   $FF
          ldx   #0
          stx   VTAB
          +ST16 PTR
+         php                         ; save C, but Z=1 because of ldx #0
 @drawLine
          lda   $FF
          sta   HTAB
-         ldy   #0
-         lda   (PTR), y              ; A = length of line, or #$FF
-         bmi   drawLineDone          ; if #$FF then we're done
-         php                         ; C = whatever was passed in
-         pha                         ; save length
-         jsr   DrawStringSuperInternal
-         pla                         ; A = length of line
-         clc                         ; advance PTR to start of next line
+         jsr   DrawStringInternal_PTR_is_already_set
+         bmi   @donePage
+         clc
          adc   PTR
          sta   PTR
          bcc   +
          inc   PTR+1
-+        plp
-         inc   VTAB                  ; this will print 255 lines if you give
-         bne   @drawLine             ; it 255 lines, because this is assembly
-drawLineDone
++        plp                         ; restore C to whatever it was on entry
+         php
+         beq   @drawLine             ; always branches
+@donePage
+         plp
          rts
 
 Draw40CharsInternal
@@ -51,13 +48,12 @@ Draw40CharsInternal
 ;v carry bit set   -> draw on page 2
 ; $25 contains textpage line (0..23) (this is the standard VTAB address)
 ; drawing starts at HTAB 0
-; increments VTAB
+; increments VTAB on exit
 ; sets HTAB to 0 on exit
 ; clobbers A/X/Y
          jsr   +
          ldx   #40
          jsr   DrawBufferInternal
-         inc   VTAB
 +        ldx   #0
          stx   HTAB
          rts
@@ -78,10 +74,11 @@ DrawCenteredStringInternal
          lsr
          sta   HTAB
          plp
-         beq   +
+         beq   DrawStringInternal_PTR_and_Y_are_already_set
 
 DrawStringInternal
 ; A/Y contains address of length-prefixed string
+; length can be 0
 ; carry bit clear -> draw on page 1
 ; carry bit set   -> draw on page 2
 ; $24 contains starting column (0..39) (this is the standard HTAB address)
@@ -89,13 +86,16 @@ DrawStringInternal
 ; clobbers A/X/Y
 ; clobbers PTR/PTR+1
          +ST16 PTR
+DrawStringInternal_PTR_is_already_set
          ldy   #0
-+        lda   (PTR),y
-DrawStringSuperInternal
-         tax
+DrawStringInternal_PTR_and_Y_are_already_set
+         lda   (PTR),y
          inc   PTR
          bne   +
          inc   PTR+1
++        tax
+         bpl   +
+         rts
 +
          +LD16 PTR
          ; /!\ execution falls through here to DrawBufferInternal
@@ -111,11 +111,11 @@ DrawBufferInternal
 ; $25 contains textpage line (0..23) (this is the standard VTAB address)
 ; all characters are drawn on the same line
 ; HTAB is incremented for each character
-; VTAB is NOT incremented
-; clobbers A/X/Y
+; clobbers X,Y
+; increments VTAB on exit
+; A=buffer length on exit
+; N=0 on exit
          +ST16 DBISrc+1
-         dex
-         bmi   drawLineDone          ; empty string
          php
          lda   VTAB
          asl
@@ -169,6 +169,9 @@ DrawBufferInternal
          sta   DBIRow5+1
          sta   DBIRow6+1
          sta   DBIRow7+1
+         txa
+         pha
+         bpl   +                     ; always branches because X is 0..40
 DBILoop
 DBISrc   ldy   $FDFD,x
          lda   FontDataRow0,y
@@ -188,6 +191,8 @@ DBIRow6  sta   $FDFD,x
          lda   FontDataRow7,y
 DBIRow7  sta   $FDFD,x
          inc   HTAB
-         dex
++        dex
          bpl   DBILoop
+         pla                         ; A = buffer length (passed in in X)
+         inc   VTAB
          rts