From f9a78799878e9b01ea89945e54368ab22591ba20 Mon Sep 17 00:00:00 2001
From: frankmilliron <34376619+frankmilliron@users.noreply.github.com>
Date: Sat, 28 Dec 2019 20:40:12 -0800
Subject: [PATCH] Fixes of reset vector fixes (#91)

Tested these on my ][+ tonight so they should be good. Weren't working when LC was switched out.
---
 src/prelaunch/thexder.a  |  8 +++++++-
 src/prelaunch/tomahawk.a | 19 ++++++++++++++++++-
 src/prelaunch/wolfen84.a | 12 ++++++++----
 3 files changed, 33 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 src/prelaunch/thexder.a
 mode change 100644 => 100755 src/prelaunch/tomahawk.a
 mode change 100644 => 100755 src/prelaunch/wolfen84.a

diff --git a/src/prelaunch/thexder.a b/src/prelaunch/thexder.a
old mode 100644
new mode 100755
index 86e37e357..fe0e1a1da
--- a/src/prelaunch/thexder.a
+++ b/src/prelaunch/thexder.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2019 by qkumba
+;(c) 2019 by qkumba/Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH/THEXDER",plain
@@ -11,7 +11,13 @@
          lda   #$60
          sta   $13A8
          jsr   $1200
+
          +RESET_VECTOR reset
+         lda   #<reset
+         sta   $47FC
+         lda   #>reset
+         sta   $47FD      ; moved to LC $FFFC/D
+
          +DISABLE_ACCEL
          jmp   $1800
 
diff --git a/src/prelaunch/tomahawk.a b/src/prelaunch/tomahawk.a
old mode 100644
new mode 100755
index 9ee7611bf..2128ed998
--- a/src/prelaunch/tomahawk.a
+++ b/src/prelaunch/tomahawk.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2019 by qkumba
+;(c) 2019 by qkumba/Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH/TOMAHAWK",plain
@@ -8,10 +8,27 @@
     !source "src/prelaunch/common.a"
 
          +ENABLE_ACCEL
+         +READ_RAM2_WRITE_RAM2
+         lda   #<reset
+         sta   $FFFC
+         lda   #>reset
+         sta   $FFFD      ; reset vector fix for title
+         +READ_ROM_NO_WRITE
+
          lda   #$60
          sta   $309B
          jsr   $3019
+
          +RESET_VECTOR reset
+         +READ_RAM2_WRITE_RAM2
+         lda   #<reset
+         sta   $9767
+         sta   $FFFC
+         lda   #>reset
+         sta   $9768      ; gets patched to LC later
+         sta   $FFFD      ; also, our LC fix wrecked later in title
+         +READ_ROM_NO_WRITE
+                          ; yes, it changes the vector like 300 times
          +DISABLE_ACCEL
          lda   $C083
          jmp   $235
diff --git a/src/prelaunch/wolfen84.a b/src/prelaunch/wolfen84.a
old mode 100644
new mode 100755
index eb1ea2617..818a1d929
--- a/src/prelaunch/wolfen84.a
+++ b/src/prelaunch/wolfen84.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2019 by qkumba
+;(c) 2019 by qkumba/Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH/WOLFEN84",plain
@@ -23,10 +23,14 @@ reset
          jmp   $FAA6
 
 callback
-         lda   #>reset
-         sta   $9E52
+         +READ_RAM2_WRITE_RAM2
          lda   #<reset
-         sta   $9E53      ; reset vector patch
+         sta   $9E52
+         sta   $FFFC
+         lda   #>reset
+         sta   $9E53
+         sta   $FFFD       ; reset vector patch
+         +READ_ROM_NO_WRITE
 
          +DISABLE_ACCEL
          jmp   $9D84