From 17bedbdb8dfa450d5bc835c4968bae63060c88c4 Mon Sep 17 00:00:00 2001
From: FeralChild64 <you@example.com>
Date: Thu, 8 Aug 2019 17:29:50 +0200
Subject: [PATCH] fixed interrupt vector regression, updated documentation

---
 STATUS.md                           |   3 ++-
 bin/kernal_generic.rom              | Bin 8192 -> 8192 bytes
 bin/kernal_mega65.rom               | Bin 8192 -> 8192 bytes
 bin/kernal_ultimate64.rom           | Bin 8192 -> 8192 bytes
 c64/kernal/interrupts/irq_handler.s |   2 +-
 c64/kernal/interrupts/nmi_handler.s |   2 +-
 6 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/STATUS.md b/STATUS.md
index fa58b42e..71c5f15f 100644
--- a/STATUS.md
+++ b/STATUS.md
@@ -26,8 +26,9 @@ The following ROM features are currently missing:
 * floating point routines
 * tape support
 * RS-232 support
-* warm start (RUN/STOP + RESTORE) - NMI/BRK handling is not implemented at all
+* NMI cartridge handling and BRK handling are not implemented yet
 * breaking Kernal routines with RUN/STOP key
+* PAL/NTSC is detected, but for now only startup banner uses the result
 
 Features currently being worked on:
 
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 4db3c6affdadb5a4ae78c0bd1cc81b3f529b66ef..bafc66c82bd6122af7002b99c49fe20f529832fe 100644
GIT binary patch
delta 30
mcmZp0XmHpND=PSbIY)%q$M98!$65(yUP<N;oAX2`aRC6IbqWLk

delta 30
mcmZp0XmHpND=K(_IY)%q$M98!$65(yUP<N)oAX2`aRC6E^$ElP

diff --git a/bin/kernal_mega65.rom b/bin/kernal_mega65.rom
index 4db3c6affdadb5a4ae78c0bd1cc81b3f529b66ef..bafc66c82bd6122af7002b99c49fe20f529832fe 100644
GIT binary patch
delta 30
mcmZp0XmHpND=PSbIY)%q$M98!$65(yUP<N;oAX2`aRC6IbqWLk

delta 30
mcmZp0XmHpND=K(_IY)%q$M98!$65(yUP<N)oAX2`aRC6E^$ElP

diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 4db3c6affdadb5a4ae78c0bd1cc81b3f529b66ef..bafc66c82bd6122af7002b99c49fe20f529832fe 100644
GIT binary patch
delta 30
mcmZp0XmHpND=PSbIY)%q$M98!$65(yUP<N;oAX2`aRC6IbqWLk

delta 30
mcmZp0XmHpND=K(_IY)%q$M98!$65(yUP<N)oAX2`aRC6E^$ElP

diff --git a/c64/kernal/interrupts/irq_handler.s b/c64/kernal/interrupts/irq_handler.s
index 0a3634ab..06175ff9 100644
--- a/c64/kernal/interrupts/irq_handler.s
+++ b/c64/kernal/interrupts/irq_handler.s
@@ -20,7 +20,7 @@ irq_handler:
 	;; Call interrupt routine (only if initialised)
 	lda CINV
 	ora CINV+1
-	bne +
+	beq +
 	jmp (CINV)
 *
 	;; Vector not initialized - call default interrupt routine
diff --git a/c64/kernal/interrupts/nmi_handler.s b/c64/kernal/interrupts/nmi_handler.s
index 90c05444..c5336f8b 100644
--- a/c64/kernal/interrupts/nmi_handler.s
+++ b/c64/kernal/interrupts/nmi_handler.s
@@ -7,7 +7,7 @@ nmi_handler:
 	pha
 	lda NMINV
 	ora NMINV+1
-	bne +
+	beq +
 	pla
 	jmp (NMINV)
 *