From 5e5e080d618db036c632e096bdf6ce5c77b33bae Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 26 Apr 2017 21:29:15 -0600
Subject: [PATCH] More compact status

---
 x86_64/bootsector.asm     | 8 +++++++-
 x86_64/startup-common.asm | 2 ++
 x86_64/vesa.asm           | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/x86_64/bootsector.asm b/x86_64/bootsector.asm
index b66184e884..b6ef71938f 100644
--- a/x86_64/bootsector.asm
+++ b/x86_64/bootsector.asm
@@ -40,6 +40,7 @@ boot: ; dl comes with disk
     xor dx, dx
     call load
 
+    call print_line
     mov si, finished
     call print
     call print_line
@@ -125,6 +126,9 @@ load:
       ret
 
 print_dapack:
+    mov al, 13
+    call print_char
+
     mov bx, [DAPACK.addr + 2]
     call print_num
 
@@ -149,9 +153,11 @@ print_dapack:
     mov bx, [DAPACK.buf]
     call print_num
 
-    jmp print_line
+    ret
 
 error:
+    call print_line
+
     mov bh, 0
     mov bl, ah
     call print_num
diff --git a/x86_64/startup-common.asm b/x86_64/startup-common.asm
index 3a86a9bd08..ab6b77b0e0 100644
--- a/x86_64/startup-common.asm
+++ b/x86_64/startup-common.asm
@@ -70,6 +70,8 @@ kernel_base equ 0x100000
     mov ecx, (kernel_file.length_sectors % buffer_size_bytes) / 4
     a32 rep movsd
 finished_loading:
+    call print_line
+
     call memory_map
 
     call vesa
diff --git a/x86_64/vesa.asm b/x86_64/vesa.asm
index b649e4b968..4fe03e8f4e 100644
--- a/x86_64/vesa.asm
+++ b/x86_64/vesa.asm
@@ -68,6 +68,8 @@ vesa:
     cmp cx, [.miny]
     jb .searchmodes
 .testgood:
+    mov al, 13
+    call charrm
     mov cx, [.currentmode]
     mov [.goodmode], cx
     push esi
@@ -120,7 +122,7 @@ vesa:
 .minx dw 640
 .miny dw 480
 
-.modeok db ": Is this OK? (s)ave/(y)es/(n)o",10,13,0
+.modeok db ": Is this OK? (s)ave/(y)es/(n)o    ",8,8,8,8,0
 
 .goodmode dw 0
 .currentmode dw 0