From c153588600d8c90f1b1212f37cde1334560b13d6 Mon Sep 17 00:00:00 2001
From: Karol Stasiak <karol.m.stasiak@gmail.com>
Date: Tue, 3 Jul 2018 23:29:37 +0200
Subject: [PATCH] Use @word for reset vectors

---
 include/nes_routines.mfk | 17 +++++------------
 include/vcs_hardware.mfk |  8 ++++----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/include/nes_routines.mfk b/include/nes_routines.mfk
index b62d02d7..30e358bc 100644
--- a/include/nes_routines.mfk
+++ b/include/nes_routines.mfk
@@ -50,16 +50,9 @@ interrupt void on_nmi() {
     nmi()
 }
 
-array nmi_vector @$FFFA = [
-    on_nmi.addr.lo,
-    on_nmi.addr.hi
-]
-array reset_vector @$FFFC = [
-    on_reset.addr.lo,
-    on_reset.addr.hi
-]
-array irq_vector @$FFFE = [
-    on_irq.addr.lo,
-    on_irq.addr.hi
-]
+array nmi_vector @$FFFA = @word [on_nmi.addr]
+
+array reset_vector @$FFFC = @word [on_reset.addr]
+
+array irq_vector @$FFFE = @word [on_irq.addr]
 
diff --git a/include/vcs_hardware.mfk b/include/vcs_hardware.mfk
index df471750..d16f6949 100644
--- a/include/vcs_hardware.mfk
+++ b/include/vcs_hardware.mfk
@@ -105,8 +105,8 @@ asm void reset_routine() @$FFF4 {
     JMP main
 }
 
-array __vectors @$FFFA = [
-    reset_routine.addr.lo, reset_routine.addr.hi,
-    reset_routine.addr.lo, reset_routine.addr.hi,
-    reset_routine.addr.lo, reset_routine.addr.hi
+array __vectors @$FFFA = @word [
+    reset_routine.addr,
+    reset_routine.addr,
+    reset_routine.addr
 ]