From 2e01285a79ce678ce7a35d6c5f0db17879eee2b7 Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Tue, 27 Mar 2018 21:26:47 +0200
Subject: [PATCH] =?UTF-8?q?m=C3=A1s=20cambios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hardware/kartusho/amstrad/KARTUSHO.ROM | Bin 524288 -> 524288 bytes
 hardware/kartusho/amstrad/kartusho.asm |  23 +++++++++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/hardware/kartusho/amstrad/KARTUSHO.ROM b/hardware/kartusho/amstrad/KARTUSHO.ROM
index 080db1b58e1eb0e9a035517265bfa4a485eca6f1..d1554e8bb299bda7f6715523f2dfe2ca3b9b4116 100644
GIT binary patch
delta 173
zcmZo@P-tjSnBZE^w&!gi+rGDpMNTJad}f?c|JKva;p`m-#y|Esf(#CCH`qCyz2k5=
z*I~WQ*@q5x&Opvt7lyMP9Cj{1=6ax*;tvMF4}oWAFxWAg1G$Io^B5T#DtO*5Xg_m<
z!QlJVKm!otwBTt0u)rrC4VgIQ)5Zq8VjMt$jmNC)oB!Fj|FdTVVkRJF24WT<W(8ul
L?f>lAnGOH|;sH)x

delta 167
zcmZo@P-tjSnBZE!o^8+DO16D(7u)<3Q25L^qyDX@ox|CC42*y5a|9V2-flRY>9F4B
z>|=+(vn~v0J2>o|&fara59BNUVi5cgcy<<poik9xj?o+_X6FKA9=6Y8WN4`1dAp$f
z%q<3k?^gp2K#bFZrv<<QpLjH6;*?Jt8}N#8v@@N#weg6ReUn3*17n*5Q=0>Gn*&Rm
N18bWD+cF3C0|51IN1Ffu

diff --git a/hardware/kartusho/amstrad/kartusho.asm b/hardware/kartusho/amstrad/kartusho.asm
index cf8b81d..a638962 100644
--- a/hardware/kartusho/amstrad/kartusho.asm
+++ b/hardware/kartusho/amstrad/kartusho.asm
@@ -29,14 +29,13 @@ cont    out     (c), h          ; Port A
         and     $10
         ld      e, a
         add     hl, de
-        xor     a
 crctlo  ld      b, $bc          ; inicializo registros CRCT
-        out     (c), a
+        out     (c), d
         ld      b, $be
         outi
-        inc     a
-        cp      $10
-        jr      nz, crctlo
+        inc     d
+        bit     4, d
+        jr      z, crctlo
         ld      bc, $7f98
         out     (c), c
 
@@ -47,18 +46,23 @@ crctlo  ld      b, $bc          ; inicializo registros CRCT
         ld      l, h            ; HL= 0
         ld      de, $4000
         ldir
+
+  ld a, $42                     ; poner borde cyan
+  call border+$4000
+
         jp      toram+$4000
 
 toram   xor     a
         inc     a
         call    chslot+$4000    ; cargo ROM del 464 en 0000
 
+  ld a, $43                     ; poner borde amarillo
+  call border+$4000
 
-        ld      d, c            ; D=0
         call    $0044           ; initialise LOW KERNEL and HIGH KERNEL jumpblocks
         call    $0888           ; JUMP RESTORE
 
-  ld a, $42                     ; poner borde cyan
+  ld a, $44                     ; poner borde azul
   call border+$4000
 
         xor     a
@@ -67,15 +71,10 @@ toram   xor     a
         ld      de, $51f0
         call    sauk            ; descomprimo
 
-  ld a, $43                     ; poner borde amarillo
-  call border+$4000
-
         ld      a, 1
         scf                     ; bloqueo después
         call    chslot+$4000    ; cargo ROM del 464
 
-  ld a, $44                     ; poner borde azul
-  call border+$4000
 
         jp      $6e3f           ; salto a juego