From fb7996b0ce66be7675cb856d53780e73b5f3d5fd Mon Sep 17 00:00:00 2001
From: compyx <b.wassink@ziggo.nl>
Date: Fri, 10 Jul 2020 19:56:34 +0200
Subject: [PATCH] Revert "C64 soft80 conio: save 6 bytes in `firstinit`"

This reverts commit 943e68be6a3b48529540e8f86061f171634f80f9.
---
 libsrc/c64/soft80_conio.s | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/libsrc/c64/soft80_conio.s b/libsrc/c64/soft80_conio.s
index 355ae51a0..48039d288 100644
--- a/libsrc/c64/soft80_conio.s
+++ b/libsrc/c64/soft80_conio.s
@@ -67,20 +67,22 @@ firstinit:
 
         inc     soft80_first_init
 
-        ; save 6 bytes due to soft80_charset, soft80_lo_charset and
-        ; soft80_hi_charset being page-aligned.
-        ldy     #0
+        lda     #<soft80_charset
         ldx     #>soft80_charset
-        sty     ptr1
+        sta     ptr1
         stx     ptr1+1
+        lda     #<soft80_lo_charset
         ldx     #>soft80_lo_charset
-        sty     ptr2
+        sta     ptr2
         stx     ptr2+1
+        lda     #<soft80_hi_charset
         ldx     #>soft80_hi_charset
-        sty     ptr3
+        sta     ptr3
         stx     ptr3+1
 
         ldx     #4
+@l2:
+        ldy     #0
 @l1:
         lda     (ptr1),y
         sta     (ptr2),y
@@ -95,17 +97,17 @@ firstinit:
         inc     ptr2+1
         inc     ptr3+1
         dex
-        bne     @l1
+        bne     @l2
 
         ; copy the kplot tables to ram under I/O
         ;ldx     #0             ; is 0
-@l2:
+@l3:
         lda     soft80_tables_data_start,x
         sta     soft80_bitmapxlo,x
         lda     soft80_tables_data_start + (soft80_tables_data_end - soft80_tables_data_start - $0100),x
         sta     soft80_bitmapxlo + (soft80_tables_data_end - soft80_tables_data_start - $0100),x
         inx
-        bne     @l2
+        bne     @l3
 
         pla
         sta     $01