Rework it all to use the new macros.

[fpgaboy.git] / rom.asm

diff --git a/rom.asm b/rom.asm
index 437f01e5c5e036687992cf8a7ea646588eb7695d..512cfcedf6c6bb4f7ebb6dbea41ae8b88cd7aa54 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -5,14 +5,22 @@ main:
        ld a, $FF
        ld [c],a
        
-       ld sp, $DFFF
+       ld sp, $DFF0
+       
+       ld hl, $DF81
+       ld a, $80
+       ld [hl], a
+
+;      ld c, $07
+;      ld a, $04       ;start timer, 4.096KHz
+;      ld [c], a
+diqs:; ei
+       jr diqs
 
        ld hl, signon
        call puts
 
-       ld c, $07
-       ld a, $04       ;start timer, 4.096KHz
-       ld [c], a
+       
        ei
        
        call memtest
@@ -24,17 +32,37 @@ main:
 
        jr main
 
-       section "fuq",HOME[$100]
+       section "fuq",HOME[$50]
 irqhand:
        PUSH AF
        PUSH BC
        PUSH DE
        PUSH HL
+       
+;      ld c, $51
+;      ld a, $F0
+;      ld [c], a
+       
        xor a
        ld c, $0F       ; ack the irq
        ld [c], a
-       ld a, $41       ; print A
-       call putc
+       
+       ;ld a, $41      ; print A
+       ;call putc
+       
+       ld hl, $DF81
+       ld a, [hl]
+;      ld b, 1
+;      add b
+       ld c, $51
+;      ld [c], a
+;      ld [hl], a
+
+
+;      ld c, $51
+;      ld a, $0F
+;      ld [c], a
+       
        POP HL
        POP DE
        POP BC
@@ -49,7 +77,7 @@ memtest:
        ld hl,memteststr
        call puts
        
-       ld hl, $C000            ; Write loop
+       ld hl, $C001            ; Write loop
 .wr:
        ld a,h
        xor l
@@ -61,7 +89,7 @@ memtest:
        cp l
        jr nz, .wr
 
-       ld hl, $C000            ; Read loop
+       ld hl, $C001            ; Read loop
 .rd:
        ld a,h
        xor l
@@ -135,6 +163,7 @@ waitsw:
 .loop1:
        ld a,[c]
        cp b
+       ei
        jr z,.loop1
 .loop2:
        ld a,[c]
@@ -269,8 +298,6 @@ puts:
        ld a, [hli]
        ld b, $00
        cp b
-       jr z, .done
+       ret z
        call putc
        jr puts
-.done:
-       ret