From 9ad2d066be97854f7a8868fcb48a52371b7c5ace Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Tue, 27 Mar 2018 21:01:57 +0200
Subject: [PATCH] Inicializo CRTC en ROM al comienzo

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

diff --git a/hardware/kartusho/amstrad/KARTUSHO.ROM b/hardware/kartusho/amstrad/KARTUSHO.ROM
index b8862ba8f371e4361a0bde460b835abc3f8dfed8..080db1b58e1eb0e9a035517265bfa4a485eca6f1 100644
GIT binary patch
delta 237
zcmZo@P-tjSsQ>&n%#h)Lq69+-W7GGyo~&;ZS>IN$N+{WD==I67NlG)YGcXu19AE(P
z)fgn@VEo@F-zGBFzklobOdwuzJ=>nQm2CUoF1Gn6pzxV-M*Uk)JBPFP7#RQ9=Lj-5
zyxnj((_y{M*~bonXI&W1c5v7^oxSI<9>`a8|HUBqA@J-h20Le<kR78rP|(f=$UJPH
z$H>r7!Si-O`<Yt|2H&p+8h{w51y2ir1wQd;$iyk1Ha6fD;{Xb5JY!-%(SWVVq0ND@
X&4H=Sfw|3rrOko0&4F#11N#90YA0Po

delta 207
zcmZo@P-tjS5c+J$aDefTy&?mHAcMo(4Tr59COev_)&D;EHf+7k*_RG>4riY@1Tr>#
zf9uKmHjwpg1(0N{fB)9=nLxba5!Ur@gV^@Gtz_HxcCpPr0fo<uGwR=Zo^@e3+reSy
z1k|}6XoMmIqu__YvkMsPoPi>CjOHL?U4YEP_IZp94HZ0Z7qp*wz+mwGYM=p#aa!=S
zr~p{x6OV>WobqX7170x>puomsCiYDZZ4QiW4oqzh%xw-VZ4Rt$4s6RD*be{zV<lMF

diff --git a/hardware/kartusho/amstrad/kartusho.asm b/hardware/kartusho/amstrad/kartusho.asm
index dc21720..cf8b81d 100644
--- a/hardware/kartusho/amstrad/kartusho.asm
+++ b/hardware/kartusho/amstrad/kartusho.asm
@@ -1,41 +1,35 @@
         OUTPUT  KARTUSHO.ROM
         ORG     $0
         di
+        im      1
         ld      sp, $c000
-        ld      bc, $3ffc
-        ld      hl, $0000
-        ld      de, $4000
-        ldir
-        jp      conti+$4000
-
-        BLOCK   $38-$
-        ei
-        ret
-
-conti   im      1
-        xor     a
-        inc     a
-        call    chslot+$4000    ; cargo ROM del 464 en 0000
-
-  ld a, $40                     ; poner borde gris
-  call border+$4000
-
-        ld      d, c            ; D=0
+        ld      hl, initData60Hz
+        ld      d, h            ; D=H=0
         ld      bc, $f782
         out     (c), c          ; PIO Control-Register
         dec     b
-        out     (c), d          ; Port C
+        out     (c), h          ; Port C
         dec     b
         in      a, (c)          ; Read from port B 
         dec     b
-        out     (c), d          ; Port A
+        jr      cont
+initData60Hz:
+        defb    $3f, $28, $2e, $8e, $1f, $06, $19, $1b
+        defb    $00, $07, $00, $00, $30, $00, $c0, $00
+initData50Hz:
+        defb    $3f, $28, $2e, $8e, $26, $00, $19, $1e
+        defb    $00, $07, $00, $00, $30, $00, $c0, $00
+
+rst38   ei
+        ret
+
+cont    out     (c), h          ; Port A
         ld      bc, $ef7f
         out     (c), c
         and     $10
         ld      e, a
-        ld      hl, $05c4       ; 60hz
+        add     hl, de
         xor     a
-        sbc     hl, de
 crctlo  ld      b, $bc          ; inicializo registros CRCT
         out     (c), a
         ld      b, $be
@@ -45,6 +39,22 @@ crctlo  ld      b, $bc          ; inicializo registros CRCT
         jr      nz, crctlo
         ld      bc, $7f98
         out     (c), c
+
+  ld a, $40                     ; poner borde gris
+  call border
+
+        ld      bc, $3ffc
+        ld      l, h            ; HL= 0
+        ld      de, $4000
+        ldir
+        jp      toram+$4000
+
+toram   xor     a
+        inc     a
+        call    chslot+$4000    ; cargo ROM del 464 en 0000
+
+
+        ld      d, c            ; D=0
         call    $0044           ; initialise LOW KERNEL and HIGH KERNEL jumpblocks
         call    $0888           ; JUMP RESTORE
 
@@ -98,6 +108,7 @@ chslo2  djnz    chslo1
         ret
 data    incbin  Manic.bin.skv
 
+
         BLOCK   $4000-$
         incbin  OS464.ROM
         BLOCK   $80000-$