From 5ef262b131155ea46f30c1bae528548f2018d4ca Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Sat, 9 Jul 2016 23:22:07 +0200
Subject: [PATCH] Optimizo

---
 firmware/scroll/FuenteABin.c   |   8 ++--
 firmware/scroll/fuente6x8.png  | Bin 1330 -> 1295 bytes
 firmware/scroll/scroll.asm     |  79 ++++++++++++++++++++++++---------
 firmware/scroll/scrolldesc.asm |   3 +-
 4 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/firmware/scroll/FuenteABin.c b/firmware/scroll/FuenteABin.c
index 75d2a40..b02e14d 100644
--- a/firmware/scroll/FuenteABin.c
+++ b/firmware/scroll/FuenteABin.c
@@ -1,7 +1,7 @@
 #include "lodepng.c"
 #include <stdio.h>
 #include <stdlib.h>
-unsigned char *image, *pixel, output[0x300];
+unsigned char *image, *pixel, output[0x280];
 unsigned error, i, j, k, l, celda, fondo, tinta, outpos= 0;
 FILE *fo;
 
@@ -18,14 +18,14 @@ int main(int argc, char *argv[]){
   if( error )
     printf("\nError %u: %s\n", error, lodepng_error_text(error)),
     exit(-1);
-  if( i!= 96 || j!= 48 )
-    printf("\nError. Incorrect size, must be 96x48\n"),
+  if( i!= 96 || j!= 40 )
+    printf("\nError. Incorrect size, must be 96x40\n"),
     exit(-1);
   fo= fopen("fuente6x8.bin", "wb+");
   if( !fo )
     printf("\nCannot create output file\n"),
     exit(-1);
-  for ( i= 0; i < 6; i++ )
+  for ( i= 0; i < 5; i++ )
     for ( j= 0; j < 16; j++ ){
       pixel= &image[((j|i<<7)*6)<<2];
       fondo= tinta= tospec(pixel[0], pixel[1], pixel[2]);
diff --git a/firmware/scroll/fuente6x8.png b/firmware/scroll/fuente6x8.png
index 01e5d5aacb5970789dcfaca48ca367ee071604b6..54034fad570e3b6d4656d09ce857e8798ec9853b 100644
GIT binary patch
delta 462
zcmV;<0Wtov3Xckq7YZl{0{{R3Hcbx;u^~AFe+d*I6CbTiXaE2Kl}SWFR7l6oR)MmE
zFbL!Se>(5<Y#Si3I&a&nw@!OvpafF0j}IK<_?!3Fd_22%^1KHyKE9sMIj`|L-0BN}
z_4<q^_&D#cm+V#qum!+zg$UxWi@?EW!{-3xJ8z4n1ja3jMA!oO2q(Wg7IA1sx}Ph9
zf7)Y%9cj<k29>7)h~3~6!le@_;TM)m{CV-}Sn@S&<i&9Ja)lB;gCQ%v1^|40b`d~E
zAgn+D(Rd#KH2_6GsjHeAxaCojg)Ia8g0gQj-M44IOM&%D70Ow3TnIhj3V>>H)oeuN
zN}86ZAp!*eL(l`AWG7i5Iz!egW{8M&e}Kp?0rmu-;yy$K>_zJS<DTl136g!kdocLt
zMMBhtpzzWROFC`Tg-VSEx7_N01#8q8M5#6hDEp#uQwt{$Bnx>si+r#odkugq%nG2@
zgIrKC2iT0D&4Kz{3vjm%M0&qgN@(Za>hbqe@AjwF4Z%Ti+($fgFderA2QQN^H~@A8
zC->CCs-$DD2f6^QiXilqDThiMq8dX*Ae}Zms)=I!0VYy9{?aJ7)Bpeg07*qoM6N<$
Ef;;@o_y7O^

delta 497
zcmV<N0S^9;3bG227YZ;40{{R3*~pLmu^~AFe+K~;Ikz|hV*mgFxJg7oR9M69SJ`gE
zFbvcG|1^gswnI@z-32S!VR<kD!wz+jl4AD%^bbDn`}lrdVE+m7i}5)C@Mnm0rsZ_%
zcpvNGq}vJW-j^j}7%SGw(d7NW7TFkQK*yIimA&K8MMo&<-TsOVE<EwWoW1@WI#EF#
zf4K#K!ULaVSV*9TNQod&O;X;wqHPFah7J-a3tYO$hZ%B5+T)nh(9pqRH#n}4WLqQz
zyedvO@b2958aA?GnmbJKJh{AN09F?a@cQgLK<Ytq3k0B-_W@7?kO!2yvb2$6ILXOf
z2G}Tw?^E(ccFq-HecBbOm4cAfSIN6Me;sfttJR3g4CCt6vQ#|C0ASF5kS5vHU=W>=
z>J`gHs1Bg)O2F;_RNP16L1^@@iH>*DCle&vzC9Rx%7BfkHNo`^zXvzSG>r{ha;t#_
zW>!WPJU(<eKv@@!i<(Rz2shH<O!;7;?KJ>Sm=!?V52Bzn2iWwW%|SJUl>pD`TOdjA
z%cO*My+5$E-w(ChPpcaZC$c_NQ(yU>YB<27<R<_-4JX#r;#Nt=z8}n6K{2@pQd3qt
nO#cj|8$bMq_}P#DwgSEYD=Tuwqo3*G00000NkvXXu0mjf!X4<3

diff --git a/firmware/scroll/scroll.asm b/firmware/scroll/scroll.asm
index fb61429..73abef2 100644
--- a/firmware/scroll/scroll.asm
+++ b/firmware/scroll/scroll.asm
@@ -1,17 +1,16 @@
-
         output  scroll.bin
-        org     $5d29
-        ld      hl, fuente
-        ld      b, 3
-        ld      de, $c100
-        ldir
-        jp      start
-fuente  incbin  fuente6x8.bin
+        org     $5ee2
 string  include string.asm
-        block   $6d35-$
-        ld      (vari+2), ix
+  display $
+music   ld      (vari+2), ix
         incbin  music.bin
-start   ld      hl, fondo
+fuente  incbin  fuente6x8.bin
+  display $
+start   ld      hl, fuente
+        ld      b, 3
+        ld      de, $c180
+        ldir
+        ld      hl, fondo
         ld      b, $40          ; filtro RCS inverso
 start0  ld      a, b
         xor     c
@@ -29,15 +28,51 @@ start0  ld      a, b
         ld      a, b
         sub     $58
         jr      nz, start0
-;        ld      hl, $5800
-;        ld      de, $5801
         ld      b, 3
-;        ld      (hl), l
         ldir
-;        xor     a
         out     ($fe), a
         inc     a
         ex      af, af'
+        ld      de, $401f
+rever   ld      hl, $ffe1
+        add     hl, de
+        ld      c, (hl)
+        ld      a, $80
+revl1   rl      c
+        rra
+        jr      nc, revl1
+        ld      (de), a
+        inc     hl
+        dec     de
+        ld      c, (hl)
+        ld      a, $80
+revl2   rl      c
+        rra
+        jr      nc, revl2
+        ld      (de), a
+        inc     hl
+        dec     de
+        ld      c, (hl)
+        ld      a, $80
+revl3   rl      c
+        rra
+        jr      nc, revl3
+        ld      (de), a
+        inc     hl
+        dec     de
+        ld      c, (hl)
+        ld      a, $80
+revl4   rl      c
+        rra
+        jr      nc, revl4
+        ld      (de), a
+        ld      hl, $23
+        add     hl, de
+        ex      de, hl
+        ld      a, d
+        cp      $58
+        jr      nz, rever
+
         ld      hl, $c000
         ld      de, $c400
 start1  ld      b, $08
@@ -48,15 +83,15 @@ start2  ld      a, (hl)
         cpi
         jp      pe, start2
         jr      nc, start1
-
+        ld      a, $c9
+        ld      ($c006), a
         ld      hl, $716f
-        call    $6d3c
-
-start3  ei
-        call    $6e77
+        call    music+7
+start3  call    $6e77
+        ei
         halt
         di
-        ld      bc, 4
+        ld      bc, 5
 start4  djnz    start4
         dec     c
         jr      nz, start4
@@ -78,7 +113,7 @@ start4  djnz    start4
 vari    ld      ix, string
         ld      hl, start3
         push    hl
-        ld      hl, $6d35
+        ld      hl, music
         push    hl
         ex      af, af'
         rrca
diff --git a/firmware/scroll/scrolldesc.asm b/firmware/scroll/scrolldesc.asm
index 6f4b692..94b1e3b 100644
--- a/firmware/scroll/scrolldesc.asm
+++ b/firmware/scroll/scrolldesc.asm
@@ -1,7 +1,7 @@
         include define.asm
         output  scrolldesc.bin
         org     $5ccb
-        ld      de, $5d29+filesize-1
+        ld      de, $5ee2+filesize-1
         di
         defb    $de, $c0, $37, $0e, $8f, $39, $96
         jr      aqui
@@ -54,5 +54,6 @@ offend  rr      e
         lddr
 exitdz  pop     hl
         jr      nc, mainlo
+        jp      $7be4
         incbin  scroll.bin.zx7b
 fin
\ No newline at end of file