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 cd3cf2daf4600afb79201fde195e3e413909c73d..d650855e429cdb8c222197d8c401cf8c6bb985f8 100644 (file)
--- a/rom.asm
+++ b/rom.asm
@@ -191,24 +191,28 @@ insntest:
        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
 
@@ -229,9 +233,6 @@ puts:
        ld a, [hli]
        ld b, $00
        cp b
-       jr z, .done
+       ret z
        call putc
        jr puts
-.done:
-       ret
-