Merge branch 'master' of goat:git/bootcard

[bootcard] / bootcard.asm

diff --git a/bootcard.asm b/bootcard.asm
index ed23d79..016d7a9 100644 (file)
--- a/bootcard.asm
+++ b/bootcard.asm
@@ -6,9 +6,16 @@
        org 7c00h
        bits 16
 
+barh   equ 4
+nbars  equ 11
+barstart equ 200 - (nbars+1) * barh
+
 nticks equ 7e00h
 tmoffs equ 7e04h
-muscur equ 7e08h
+musptr equ 7e08h
+frame  equ 7e0ch
+fval   equ 7e10h
+cmap   equ 7e14h
 
 %macro setcur 2
        mov dx, %1 | (%2 << 8)
@@ -42,7 +49,7 @@ start:        xor ax, ax
        mov sp, 7c00h
 
        mov di, nticks
-       mov cx, 6
+       mov cx, 8
        rep stosw
 
        mov word [32], tintr
@@ -52,24 +59,27 @@ start:      xor ax, ax
 
        mov ax, 13h
        int 10h
-       push 1000h
+       push 0a000h
        pop es
 
+       
+       mov al, 16
+       mov di, barstart * 320
+       mov bx, nbars
+.drawbars:
+       mov cx, barh * 320
+       rep stosb
+       inc al
+       dec bx
+       jnz .drawbars
+
+       setcur 12, 16
+       mov si, str1
+       call textout
+
        sti
 
 mainloop:
-       call drawbg
-
-       push ds
-       push es
-       push es
-       pop ds
-       push 0a000h
-       pop es
-       xor di, di
-       xor si, si
-       mov cx, 32000
-
        mov dx, 3dah
 .invb: in al, dx
        and al, 8
@@ -78,22 +88,9 @@ mainloop:
        and al, 8
        jz .novb
 
-       rep movsw
-       pop es
-       pop ds
-
-       setcur 10, 0
-       mov si, str1
-       call textout
-       setcur 12, 1
-       mov si, str2
-       call textout
-
-       jmp mainloop
-
 drawbg:
        mov bx, 200
-       mov di, 5120
+       xor di, di
 .fillgrad:
        mov ax, bx
        mov ah, al
@@ -115,20 +112,23 @@ drawbg:
        fistp word [bp - 2]
        fstp st0
        mov bx, [bp - 2]
-       add bx, 100
+       add bx, 84
        imul bx, bx, 320
        add bx, cx
 .mntcol:
        mov byte [es:bx], 0
        add bx, 320
-       cmp bx, 64000
+       cmp bx, 128 * 320
        jb .mntcol
 
        dec cx
        jnz .mnt
-       
-       ret
 
+       test word [nticks], 0fh
+       jnz mainloop
+       call fadecol
+
+       jmp mainloop
 
 textout:
        mov al, [si]
@@ -141,29 +141,71 @@ textout:
        jmp textout
 .done: ret
 
+fadecol:
+       push es
+       push word 0
+       pop es
+       mov ax, 16
+       mov dx, 3c7h
+       out dx, al
+       add dx, 2
+       mov cx, 16 * 3
+       mov di, cmap
+       rep insb
+       pop es
+       dec dx
+       out dx, al
+       inc dx
+       mov cx, 16 * 3
+       mov si, cmap
+.fadeloop:
+       lodsb
+       test al, al
+       jz .skipdec
+       dec al
+.skipdec:
+       out dx, al
+       dec cx
+       jnz .fadeloop
+       ret
+
 tintr:
        pusha
-       push ds
-       push word 0
-       pop ds
        mov ax, [nticks]
        inc ax
        mov [nticks], ax
 
+       mov bx, [musptr]
+       cmp bx, 23*3
+       jnz .skiploop
+       xor bx, bx
+       mov [tmoffs], ax
+.skiploop:
+       xor cx, cx
+       mov cl, [music + bx]
+       shl cx, 4
        sub ax, [tmoffs]
-.pmus: mov bx, [muscur]
-       shl bx, 2
-       mov cx, [music + bx]
-       cmp cx, 0ffffh
-       jz .loop
        cmp ax, cx
        jb .eoi
 
-       inc word [muscur]
-       mov ax, [music + 2 + bx]
+       mov ax, [music + 1 + bx]
+       add bx, 3
+       mov [musptr], bx
        test ax, ax
        jz .off
        mov bx, ax
+
+       mov dx, 3c8h
+       shr ax, 9
+       add ax, 3
+       out dx, al
+       inc dx
+       mov al, 3fh
+       out dx, al
+       mov al, 2fh
+       out dx, al
+       out dx, al
+
        stimer 2, bx
        spkon
        jmp .eoi
@@ -172,51 +214,15 @@ tintr:
 
 .eoi:  mov al, 20h
        out 20h, al
-       pop ds
        popa
        iret
 
-.loop: neg cx
-       mov [muscur], cx
-       mov ax, [nticks]
-       mov [tmoffs], ax
-       jmp .pmus
-       
+str1:  db 'Michael ',3,' Athena',0
 
-str1:  db 'message blah',0
-str2:  db 'Michael & Athena',0
-
-G2     equ 12175
-C3     equ 9121
-D3     equ 8126
-B2     equ 9664
-F3     equ 6833
-E3     equ 7239
-
-music: dw 0,           0
-       dw 40,          G2
-       dw 200,         C3
-       dw 320,         C3
-       dw 360,         C3
-       dw 600,         0
-       dw 680,         G2
-       dw 840,         D3
-       dw 960,         B2
-       dw 1000,        C3
-       dw 1240,        0
-       dw 1320,        G2
-       dw 1480,        C3
-       dw 1600,        F3
-       dw 1640,        F3
-       dw 1800,        E3
-       dw 1920,        D3
-       dw 1960,        C3
-       dw 2120,        B2
-       dw 2240,        C3
-       dw 2280,        D3
-       dw 2600,        0
-       dw 2760,        0
-       dw 0ffffh,      0
+music: dd 0a2f8f00h, 0a11123a1h, 23a11423h, 28000023h, 0be322f8fh, 25c0391fh
+       dd 4b23a13ch, 8f500000h, 23a15a2fh, 641ab161h, 476e1ab1h, 1fbe751ch
+       dd 8223a178h, 0a18925c0h, 1fbe8c23h, 0aa0000a0h
+       dw 0
 
 w5:    dw 5
 w30:   dw 30