From 9a45ba76bc739ed398131fcf4351aea8c281ff0e Mon Sep 17 00:00:00 2001 From: antoniovillena Date: Mon, 27 Jun 2016 17:12:19 +0200 Subject: [PATCH] Subo cambios --- firmware/scroll/player.asm | 29 ++------------------------ firmware/scroll/scroll.asm | 37 ++++++++++------------------------ firmware/scroll/scroll.bat | 7 ++++--- firmware/scroll/scrolldesc.asm | 2 +- 4 files changed, 18 insertions(+), 57 deletions(-) diff --git a/firmware/scroll/player.asm b/firmware/scroll/player.asm index 609a7c0..5e70878 100644 --- a/firmware/scroll/player.asm +++ b/firmware/scroll/player.asm @@ -1,15 +1,6 @@ - -; output player.bin -; org $c004 -; jp inicia_efecto -; jp poff -; jp cancio - ; SPECTRUM PSG proPLAYER V 0.2 - WYZ 07.09.2011 ; VER AL FINAL PARA DATOS PROPIOS: - - ; ISR LLAMA A: inicio: ld (vari+2), ix call rout @@ -189,26 +180,11 @@ pcajp5: pop hl ;in:(a)=nº de cancion cancio: ld hl, interr ;carga cancion set 1, (hl) ;reproduce cancion - ld hl, song - ld (hl), a ;nº (a) -;decodificar -;in-> interr 0 on -; song -;carga cancion si/no -;decode_song: - -; ld a, (song) - -;lee cabecera de la cancion -;byte 0=tempo - -; ld hl, tabla_song -; call ext_word ld hl, song_1 ld a, (hl) ld (tempo), a - xor a - ld (ttempo), a +; xor a +; ld (ttempo), a ;header byte 1 ;(-|-|-|-|-|-|-|loop) @@ -691,7 +667,6 @@ interr: defb 00 ;INTERRUPTORES 1=ON 0=OFF ;BIT 3=EFECTOS ON/OFF ttempo: defb 00 ;DB CONTADOR TEMPO tempo: defb 00 ;DB TEMPO -song: defb 00 ;DBNº DE CANCION puntero_a: defw 00 ;DW PUNTERO DEL CANAL A puntero_b: defw 00 ;DW PUNTERO DEL CANAL B puntero_c: defw 00 ;DW PUNTERO DEL CANAL C diff --git a/firmware/scroll/scroll.asm b/firmware/scroll/scroll.asm index 815c0a5..9bab853 100644 --- a/firmware/scroll/scroll.asm +++ b/firmware/scroll/scroll.asm @@ -1,6 +1,6 @@ output scroll.bin - org $5d27 + org $5d28 ld hl, fondo ld b, $40 ; filtro RCS inverso start ld a, b @@ -24,13 +24,6 @@ start ld a, b out ($fe), a inc a ex af, af' -; ld ix, string -; ld hl, chr -; push hl -; pop ix -; ld de, $b400-fondo+chr -; ld bc, fondo-chr -; ldir ld hl, $b000 ld de, $b400 start1 ld b, $08 @@ -42,13 +35,12 @@ start2 ld a, (hl) jp pe, start2 jr nc, start1 - xor a call cancio start3 ei halt di - ld c, 4 + ld bc, 4 start4 djnz start4 dec c jr nz, start4 @@ -89,7 +81,6 @@ start6 push ix ld b, c ld c, $17 - push bc srl b ld a, b jr c, prn2 @@ -125,27 +116,27 @@ prn1 ld a, d pos0 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $2c call simple pos2 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $32 ld bc, $04fc call doble pos4 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $30 ld bc, $04f0 call doble pos6 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $2e call simple inc de @@ -154,10 +145,6 @@ pos26 rr b jr c, pos6 jr pos2 -posf pop bc - inc c - ret - prn2 and %11111100 ld d, a xor b @@ -190,27 +177,27 @@ prn2 and %11111100 pos1 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $2f ld bc, $04e0 call doble pos3 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $2d call simple pos5 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $33 ld bc, $04fe call doble pos7 ld a, (ix) inc ix add a, a - jr z, posf + ret z ld h, $31 ld bc, $04f8 call doble @@ -272,8 +259,6 @@ doble2 ld a, (de) string include string.asm fondo incbin fondo.rcs -fin include player.asm + include player.asm block $b080-$ incbin fuente6x8.bin - display $ - diff --git a/firmware/scroll/scroll.bat b/firmware/scroll/scroll.bat index e0182ad..0eda417 100644 --- a/firmware/scroll/scroll.bat +++ b/firmware/scroll/scroll.bat @@ -1,9 +1,10 @@ +FuenteABin Png2Rcs fondo.png fondo.rcs -a fondo.atr -..\sjasmplus scroll.asm +sjasmplus scroll.asm call :getfilesize scroll.bin echo define filesize %_filesize% > define.asm -..\zx7b scroll.bin scroll.bin.zx7b -..\sjasmplus scrolldesc.asm +zx7b scroll.bin scroll.bin.zx7b +sjasmplus scrolldesc.asm GenTape scroll.tap basic "SCROLL" 0 scrolldesc.bin goto :eof diff --git a/firmware/scroll/scrolldesc.asm b/firmware/scroll/scrolldesc.asm index fbb4a4a..113b901 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, $5d27+filesize-1 + ld de, $5d28+filesize-1 di defb $de, $c0, $37, $0e, $8f, $39, $96 jr aqui