Fix insn_bit. HOLY SHIT THE BOOT ROM WORKS c.c

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index 80164004fea23ecde8dc9fcdd67c005c506978de..d269b25c1e38b186b7e9f62a700fe7fb9de181e9 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -32,6 +32,11 @@ main:
        
        ld hl, signon
        call puts
+
+       ld a, $91
+       ld [$FF40], a
+
+       call putscreen
        
        ei
 
@@ -48,6 +53,90 @@ 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:
+       LD A,$fc                ; $001d  Setup BG palette
+       LD [$FF47],A    ; $001f
+
+       ; Wait for vblank
+       call .vblwait
+
+       ld hl, $8000    ; Copy two tiles.
+       ld de, tiles
+       ld c, $20
+.cloop:        ld a, [de]
+       inc de
+       ld [hli], a
+       ld [hli], a
+       dec c
+       xor a
+       cp c
+       jr nz, .cloop
+       
+       ld hl, $9800
+.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
+       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:
        PUSH AF
        PUSH BC
@@ -55,14 +144,25 @@ vbl:
        PUSH HL
        
        xor a
-       ld c, $0F
-       ld [c], a
+       ld [$FF0F], a
+
+       ld a, [$FF51]
+       bit 7, a
+       jr z, .nothing
+
+       bit 0, a
+       call nz, .scyup
        
-       ld c, $42       ; SCY
-       ld a, [c]
-       inc a
-       ld [c], a
+       bit 1, a
+       call nz, .scydown
+       
+       bit 2, a
+       call nz, .scxup
+       
+       bit 3, a
+       call nz, .scxdown
 
+.nothing:
        POP HL
        POP DE
        POP BC
@@ -70,13 +170,29 @@ 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
        
        xor a
-       ld c, $0F
-       ld [c], a
+       ld [$FF0F], a
        
        POP BC
        POP AF
@@ -90,25 +206,23 @@ tmro:
        PUSH HL
        
        xor a
-       ld c, $0F
-       ld [c], a
+       ld [$FF0F], a
        
        ld c, $45       ; LYC
        ld a, [c]
        inc a
        ld [c], a
        
-       ld hl, $DF82
-       ld a, [hld]
+       ld a, [$DF82]
        cp 0
        jr z, .noprint
        ld a, $41       ; print A
        call putc
 .noprint:
-       inc [hl]
-       ld a, [hl]
-       ld c, $51
-       ld [c], a
+       ld a, [$DF81]
+       inc a
+       ld [$DF81], a
+       ld [$FF51], a
 
        POP HL
        POP DE
@@ -121,7 +235,7 @@ memtest:
        ld hl,memteststr
        call puts
        
-       ld hl, $C001            ; Write loop
+       ld hl, $C000            ; Write loop
 .wr:
        ld a,h
        xor l
@@ -133,7 +247,7 @@ memtest:
        cp $80
        jr nz, .wr
 
-       ld hl, $C001            ; Read loop
+       ld hl, $C000            ; Read loop
 .rd:
        ld a,h
        xor l
@@ -154,7 +268,7 @@ memtest:
        ret
 .memfail:                      ; Say we failed (sadface)
        ; decrement hl the easy way
-       ld a,[hld]
+       dec [hl]
        push hl
        ld hl, failatstr
        call puts
@@ -207,8 +321,8 @@ waitsw:
        ld a,[c]
        cp $0
        jr z,.loop1
-.loop2:
-       ld a,[c]
+
+.loop2:        ld a,[c]
        cp $0
        jr nz,.loop2
        ret