Yay. Fix retcc. Comparing against an x value - great idea, or greatest idea?

[fpgaboy.git] / rom.asm

diff --git a/rom.asm b/rom.asm
index c2b759883eac10bbd2b231f217cc8df3ecafdce6..d650855e429cdb8c222197d8c401cf8c6bb985f8 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -16,7 +16,7 @@ main:
 
        call waitsw
 
-       jp main
+       jr main
 
 signon:
        db $0D,$0A,$1B,"[1mFPGABoy Diagnostic ROM",$1B,"[0m",$0D,$0A,0
@@ -33,10 +33,10 @@ memtest:
        ld [hli],a
        ld a, $DF
        cp h
-       jp nz, .wr
+       jr nz, .wr
        ld a, $80
        cp l
-       jp nz, .wr
+       jr nz, .wr
 
        ld hl, $C000            ; Read loop
 .rd:
@@ -45,14 +45,14 @@ memtest:
        ld b,a
        ld a, [hli]
        cp b
-       jp nz, .memfail
+       jr nz, .memfail
        
        ld a, $DF
        cp h
-       jp nz, .rd
+       jr nz, .rd
        ld a, $80
        cp l
-       jp nz, .rd
+       jr nz, .rd
        
        ld hl, testokstr        ; Say we're OK
        call puts
@@ -113,11 +113,11 @@ waitsw:
 .loop1:
        ld a,[c]
        cp b
-       jp z,.loop1
+       jr z,.loop1
 .loop2:
        ld a,[c]
        cp b
-       jp nz,.loop2
+       jr nz,.loop2
        ret
 
 waitswstr:
@@ -138,23 +138,23 @@ insntest:
        ld hl, .pushpopfail
        ld a, d
        cp b
-       jp nz,.fail
+       jr nz,.fail
        ld a, e
        cp c
-       jp nz,.fail
+       jr nz,.fail
        
        ; Test ALU (HL).
        ld hl, .ff
        ld a, $FF
        xor [hl]
        ld hl, .xorhlfail
-       jp nz, .fail
+       jr nz, .fail
        
        ; Test JP (HL)
        ld hl, .jphl
        jp [hl]
        ld hl, .jphlfail
-       jp .fail
+       jr .fail
        rst $00
 .jphl:
 
@@ -164,7 +164,7 @@ insntest:
        cp b
        jr nz,.jr
        ld hl, .jrfail
-       jp .fail
+       jr .fail
        rst $00
 .jr:
        
@@ -173,11 +173,11 @@ insntest:
        ld a, $10
        ld b, $20
        cp b
-       jp nc,.fail
+       jr nc,.fail
        ld a, $20
        ld b, $10
        cp b
-       jp c,.fail
+       jr c,.fail
        
        ; Test CPL
        ld hl, .cplfail
@@ -185,30 +185,34 @@ insntest:
        ld b, $AA
        cpl
        cp b
-       jp nz,.fail
+       jr nz,.fail
        
        ld hl, .ok
        call puts
        ret
 .fail:
+       call puts
+       ld hl, .testfailed
        call puts
        ret
 .insnteststr:
-       db "Testing instructions... ",$0
+       db "Testing instructions... ",0
 .pushpopfail:
-       db "PUSH/POP test failed.",$0D,$0A,0
+       db "PUSH/POP",0
 .ff:
        db $FF
 .xorhlfail:
-       db "XOR [HL] test failed.",$0D,$0A,0
+       db "XOR [HL]",0
 .jphlfail:
-       db "JP [HL] test failed.",$0D,$0A,0
+       db "JP [HL]",0
 .jrfail:
-       db "JR test failed.",$0D,$0A,0
+       db "JR",0
 .cpfail:
-       db "CP test failed.",$0D,$0A,0
+       db "CP",0
 .cplfail:
-       db "CPL test failed.",$0D,$0A,0
+       db "CPL",0
+.testfailed:
+       db " test failed.",$0D,$0A,0
 .ok:
        db "OK!",$0D,$0A,0
 
@@ -220,7 +224,7 @@ putc:
 .waitport:
        ld a,[c]
        cp b
-       jp nz,.waitport
+       jr nz,.waitport
        pop af
        ld [c],a
        ret
@@ -229,9 +233,6 @@ puts:
        ld a, [hli]
        ld b, $00
        cp b
-       jp z, .done
+       ret z
        call putc
-       jp puts
-.done:
-       ret
-
+       jr puts