Say ABCD.

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index bc164a0202132a05d806f0cdc8a500fa6ad4357a..e7bb0d4bfa23a6b5ce449e624c55488a08b54ca9 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -50,64 +50,89 @@ main:
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
 
+tiles:
+       db %01111100
+       db %11000110
+       db %11000110
+       db %11111110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %00000000
+       
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11111100
+       db %00000000
+
+       db %01111100
+       db %11000110
+       db %11000010
+       db %11000000
+       db %11000010
+       db %11000110
+       db %01111100
+       db %00000000
+
+       db %11111100
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11000110
+       db %11111100
+       db %00000000
+
 putscreen:
        ; Wait for vblank
-;.stat:        ld a, [$FF41]   ; STAT
-;      and $03         ; mode
-;      cp $01          ; VBLANK
-;'     jp nz, .stat
+       call .vblwait
 
        ld hl, $8000    ; Copy two tiles.
-       ld a, $AA
-       ld [hli], a
-       ld [hli], a
-       ld a, $55
-       ld [hli], a
-       ld [hli], a
-       ld a, $AA
-       ld [hli], a
-       ld [hli], a
-       ld a, $55
-       ld [hli], a
-       ld [hli], a
-       ld a, $AA
-       ld [hli], a
-       ld [hli], a
-       ld a, $55
-       ld [hli], a
-       ld [hli], a
-       ld a, $AA
-       ld [hli], a
-       ld [hli], a
-       ld a, $55
+       ld de, tiles
+       ld c, $20
+.cloop:        push hl
+       ld h, d
+       ld l, e
+       ld a, [hl]
+       inc de
+       pop hl
        ld [hli], a
        ld [hli], a
+       dec c
        xor a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
-       ld [hli], a
+       cp c
+       jr nz, .cloop
        
        ld hl, $9800
-.loop: ld a, $01
-       ld [hli], a
-       xor a
+.vloop:        call .vblwait
+       ld c, $40
+       ld b, 0
+.loop: ld a, b
+       inc b
+       and $03
        ld [hli], a
        ld a, h
        cp $9C
-       jp nz,.loop
+       ret z
+       dec c
+       xor a
+       cp c
+       jr nz,.loop
+       jr .vloop
+
+.vblwait:
+.stat1:        ld a, [$FF41]   ; STAT
+       and $03
+       cp $00
+       jp nz, .stat1
+.stat2:        ld a, [$FF41]
+       and $03
+       cp $01
+       jr nz, .stat2
        ret
 
 vbl:
@@ -119,16 +144,34 @@ vbl:
        xor a
        ld [$FF0F], a
 
-       ld c, $42       ; SCY
-       ld a, [c]
-       inc a
-       ld [c], a
+       ld a, [$FF51]
+       ld b, a
+       and $80
+       cp $80
+       jr nz, .nothing
+       ld c, $0
+
+       ld a, b
+       and $1
+       cp c
+       call nz, .scyup
        
-       ld c, $43       ; SCX
-       ld a, [c]
-       inc a
-       ld [c], a
+       ld a, b
+       and $2
+       cp c
+       call nz, .scydown
+       
+       ld a, b
+       and $4
+       cp c
+       call nz, .scxup
+       
+       ld a, b
+       and $8
+       cp c
+       call nz, .scxdown
 
+.nothing:
        POP HL
        POP DE
        POP BC
@@ -136,6 +179,23 @@ vbl:
 
        RETI
 
+.scyup:        ld hl, $FF42
+       inc [hl]
+       ret
+
+.scydown:      ld hl, $FF42
+       dec [hl]
+       ret
+
+.scxup:        ld hl, $FF43
+       inc [hl]
+       ret
+
+.scxdown:      ld hl, $FF43
+       dec [hl]
+       ret     
+       
+
 lcdc:
        PUSH AF
        PUSH BC