IP

[fpgaboy.git] / diag.asm

diff --git a/diag.asm b/diag.asm
index e9a9f19a602d70f15445230fd9a960567194078f..3a3d6659ac4ff8ad2e85bed4c338ec35d65f3639 100644 (file)
--- a/diag.asm
+++ b/diag.asm
@@ -1,9 +1,8 @@
-       section "end",HOME[1024]
-       nop
-

        SECTION "a",HOME[$00]
 
        SECTION "a",HOME[$00]
 

-start: jp main
+start: ld a, $AA
+       ld [$FF51], a
+       jr start

        
        section "vbl",HOME[$40]
        jp vbl
        
        section "vbl",HOME[$40]
        jp vbl


@@ -14,6 +13,19 @@ start: jp main
        section "tmro",HOME[$50]
        jp tmro
 
        section "tmro",HOME[$50]
        jp tmro
 

+       SECTION "b",HOME[$100]
+boot:  jr main         ; $0100
+       nop             ; $0102
+       nop             ; $0103
+       ;Nintendo Logo  ; $0104
+       DB $CE,$ED,$66,$66,$CC,$0D,$00,$0B,$03,$73,$00,$83,$00,$0C,$00,$0D 
+       DB $00,$08,$11,$1F,$88,$89,$00,$0E,$DC,$CC,$6E,$E6,$DD,$DD,$D9,$99 
+       DB $BB,$BB,$67,$63,$6E,$0E,$EC,$CC,$DD,$DC,$99,$9F,$BB,$B9,$33,$3E
+       ;$0134 
+       DB $00,$E7,$00,$00,$00,$00,$00,$00, $00,$00,$00,$00,$00,$00,$00,$00
+       ;$0144
+       DB $00,$00,$00,$00,$00,$00,$00,$00, $00,$00,$00,$00,$00,$00,$00,$00
+

 main:
        ld a, $FF
        ld c, $51
 main:
        ld a, $FF
        ld c, $51


@@ -33,6 +45,9 @@ main:
        ld hl, signon
        call puts
 
        ld hl, signon
        call puts
 

+       ld a, $91
+       ld [$FF40], a
+

        call putscreen
        
        ei
        call putscreen
        
        ei


@@ -88,6 +103,9 @@ tiles:
        db %00000000
 
 putscreen:
        db %00000000
 
 putscreen:

+       LD A,$fc                ; $001d  Setup BG palette
+       LD [$FF47],A    ; $001f
+

        ; Wait for vblank
        call .vblwait
 
        ; Wait for vblank
        call .vblwait
 


@@ -141,30 +159,19 @@ vbl:
        ld [$FF0F], a
 
        ld a, [$FF51]
        ld [$FF0F], a
 
        ld a, [$FF51]

-       ld b, a
-       and $80
-       cp $80
-       jr nz, .nothing
-       ld c, $0
+       bit 7, a
+       jr z, .nothing

 
 

-       ld a, b
-       and $1
-       cp c
+       bit 0, a

        call nz, .scyup
        
        call nz, .scyup
        

-       ld a, b
-       and $2
-       cp c
+       bit 1, a

        call nz, .scydown
        
        call nz, .scydown
        

-       ld a, b
-       and $4
-       cp c
+       bit 2, a

        call nz, .scxup
        
        call nz, .scxup
        

-       ld a, b
-       and $8
-       cp c
+       bit 3, a

        call nz, .scxdown
 
 .nothing:
        call nz, .scxdown
 
 .nothing:


@@ -326,8 +333,8 @@ waitsw:
        ld a,[c]
        cp $0
        jr z,.loop1
        ld a,[c]
        cp $0
        jr z,.loop1

-.loop2:
-       ld a,[c]
+
+.loop2:        ld a,[c]

        cp $0
        jr nz,.loop2
        ret
        cp $0
        jr nz,.loop2
        ret


@@ -470,14 +477,14 @@ insntest:
 
 ; Serial port manipulation functions.
 putc:
 
 ; Serial port manipulation functions.
 putc:

-       ld c, $50
+       ld c, $53

        push af
 .waitport:
        ld a,[c]
        push af
 .waitport:
        ld a,[c]

-       cp $00
+       and $01

        jr nz,.waitport
        pop af
        jr nz,.waitport
        pop af

-       ld [c],a
+       ld [$FF52],a

        ret
 
 puts:
        ret
 
 puts: