From f30c240e9a097f1cd9d175275cc9f5ca8ae5a29e Mon Sep 17 00:00:00 2001
From: antoniovillena <espineter@yahoo.com>
Date: Fri, 8 Jul 2016 21:18:25 +0200
Subject: [PATCH] =?UTF-8?q?Cambio=20tracker=20de=20m=C3=BAsica?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 firmware/scroll/music.bin      | Bin 0 -> 3115 bytes
 firmware/scroll/scroll.asm     |  89 ++++++++++++++++++---------------
 firmware/scroll/scrolldesc.asm |   2 +-
 3 files changed, 49 insertions(+), 42 deletions(-)
 create mode 100644 firmware/scroll/music.bin

diff --git a/firmware/scroll/music.bin b/firmware/scroll/music.bin
new file mode 100644
index 0000000000000000000000000000000000000000..25bc21b28992bd3c86f3b308d04d77793bbb111f
GIT binary patch
literal 3115
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
FzX9$=-6sG5

literal 0
HcmV?d00001

diff --git a/firmware/scroll/scroll.asm b/firmware/scroll/scroll.asm
index 87104c8..fb61429 100644
--- a/firmware/scroll/scroll.asm
+++ b/firmware/scroll/scroll.asm
@@ -1,35 +1,45 @@
 
         output  scroll.bin
-        org     $5d28
-;        ld      hl, fondo
-;        ld      b, $40          ; filtro RCS inverso
-;start   ld      a, b
-;        xor     c
-;        and     $f8
-;        xor     c
-;        ld      d, a
-;        xor     b
-;        xor     c
-;        rlca
-;        rlca
-;        ld      e, a
-;        inc     bc
-;        ldi
-;        inc     bc
-;        ld      a, b
-;        sub     $58
-;        jr      nz, start
-        ld      hl, $5800
-        ld      de, $5801
+        org     $5d29
+        ld      hl, fuente
         ld      b, 3
-        ld      (hl), l
+        ld      de, $c100
         ldir
-        xor     a
+        jp      start
+fuente  incbin  fuente6x8.bin
+string  include string.asm
+        block   $6d35-$
+        ld      (vari+2), ix
+        incbin  music.bin
+start   ld      hl, fondo
+        ld      b, $40          ; filtro RCS inverso
+start0  ld      a, b
+        xor     c
+        and     $f8
+        xor     c
+        ld      d, a
+        xor     b
+        xor     c
+        rlca
+        rlca
+        ld      e, a
+        inc     bc
+        ldi
+        inc     bc
+        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      hl, $b000
-        ld      de, $b400
+        ld      hl, $c000
+        ld      de, $c400
 start1  ld      b, $08
 start2  ld      a, (hl)
         rrca
@@ -39,9 +49,11 @@ start2  ld      a, (hl)
         jp      pe, start2
         jr      nc, start1
 
-        call    cancio
+        ld      hl, $716f
+        call    $6d3c
 
 start3  ei
+        call    $6e77
         halt
         di
         ld      bc, 4
@@ -66,7 +78,7 @@ start4  djnz    start4
 vari    ld      ix, string
         ld      hl, start3
         push    hl
-        ld      hl, inicio
+        ld      hl, $6d35
         push    hl
         ex      af, af'
         rrca
@@ -146,27 +158,27 @@ pos0    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $2c
+        ld      h, $c0 >> 2
         call    simple
 pos2    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $32
+        ld      h, $d8 >> 2
         ld      bc, $04fc
         call    doble
 pos4    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $30
+        ld      h, $d0 >> 2
         ld      bc, $04f0
         call    doble
 pos6    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $2e
+        ld      h, $c8 >> 2
         call    simple
         inc     de
         jr      pos0
@@ -205,27 +217,27 @@ pos1    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $2f
+        ld      h, $cc >> 2
         ld      bc, $04e0
         call    doble
 pos3    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $2d
+        ld      h, $c4 >> 2
         call    simple
 pos5    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $33
+        ld      h, $dc >> 2
         ld      bc, $04fe
         call    doble
 pos7    ld      a, (ix)
         inc     ix
         add     a, a
         ret     z
-        ld      h, $31
+        ld      h, $d4 >> 2
         ld      bc, $04f8
         call    doble
         jr      pos1
@@ -283,9 +295,4 @@ doble2  ld      a, (de)
         add     hl, de
         ex      de, hl
         ret
-
-string  include string.asm
-;fondo   incbin  fondo.rcs
-        include player.asm
-        block   $b100-$
-        incbin  fuente6x8.bin
+fondo   incbin  fondo.rcs
diff --git a/firmware/scroll/scrolldesc.asm b/firmware/scroll/scrolldesc.asm
index 113b901..6f4b692 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, $5d28+filesize-1
+        ld      de, $5d29+filesize-1
         di
         defb    $de, $c0, $37, $0e, $8f, $39, $96
         jr      aqui