From 2c1c3c431b8d76848dad558bc453a5061be297be Mon Sep 17 00:00:00 2001
From: frankmilliron <34376619+frankmilliron@users.noreply.github.com>
Date: Sun, 29 May 2022 22:13:41 -0700
Subject: [PATCH] some reset fixes (#478)

* fix Prince of Persia reboot

* Additional reset fixes

* fix Victory Road reset during title screen
---
 src/prelaunch/prince.of.persia.a | 4 +++-
 src/prelaunch/victory.road.a     | 3 ++-
 src/prelaunch/voyage.valkyrie.a  | 8 +++++---
 src/prelaunch/zp.a               | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/prelaunch/prince.of.persia.a b/src/prelaunch/prince.of.persia.a
index eec35a3b5..f6296cece 100644
--- a/src/prelaunch/prince.of.persia.a
+++ b/src/prelaunch/prince.of.persia.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2022 by qkumba
+;(c) 2022 by qkumba, Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/PP",plain
@@ -7,6 +7,8 @@
 
     !source "src/prelaunch/common.a"
 
+         inc   $3F4       ; force reboot on reset
+
          +READ_RAM2_NO_WRITE
          jsr   EnableAccelerator
          lda   MachineStatus
diff --git a/src/prelaunch/victory.road.a b/src/prelaunch/victory.road.a
index b607c5989..fc83f7ada 100644
--- a/src/prelaunch/victory.road.a
+++ b/src/prelaunch/victory.road.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2022 by qkumba
+;(c) 2022 by qkumba, Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/VICTORY.ROAD",plain
@@ -20,6 +20,7 @@ callback
 
 ++
          +ENABLE_ACCEL
+         inc   $3F4       ; force reboot on reset during title screen
          lda   #$60
          sta   $11A7
          jsr   $1000      ; decompress
diff --git a/src/prelaunch/voyage.valkyrie.a b/src/prelaunch/voyage.valkyrie.a
index 38a8a7276..c12046b7a 100644
--- a/src/prelaunch/voyage.valkyrie.a
+++ b/src/prelaunch/voyage.valkyrie.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by qkumba
+;(c) 2021-22 by qkumba, Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/VV",plain
@@ -8,6 +8,8 @@
          !source "src/prelaunch/common.a"
 
          +ENABLE_ACCEL
+         +NEW_RESET_VECTOR $180
+
          lda   #<callback
          sta   $A52
          lda   #>callback
@@ -15,9 +17,9 @@
          jmp   $800       ; load "DOS"
 
 callback
-         ldx   #$00
+         ldx   #$80
          stx   $9E52
-         inx
+         ldx   #$01
          stx   $9E53
 
          +DISABLE_ACCEL
diff --git a/src/prelaunch/zp.a b/src/prelaunch/zp.a
index adcd50200..67370d2e1 100644
--- a/src/prelaunch/zp.a
+++ b/src/prelaunch/zp.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2022 by qkumba
+;(c) 2022 by qkumba, Frank M.
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/ZP",plain
@@ -7,6 +7,8 @@
 
          !source "src/prelaunch/common.a"
 
+         +NEW_RESET_VECTOR $180
+
          lda   #$60
          sta   $3076
          sta   $313B