From 7bf982ce7b12a582d39b1784a33dcc7b2deac74e Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Mon, 6 Jun 2022 08:15:42 -0700
Subject: [PATCH] fix Cavern Creatues, Conquering Worlds, Demonic Decks

---
 src/prelaunch/cavrn.cheat.a       | 9 +++++----
 src/prelaunch/conquering.worlds.a | 7 ++++++-
 src/prelaunch/demonic.decks.a     | 3 +--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/prelaunch/cavrn.cheat.a b/src/prelaunch/cavrn.cheat.a
index 9a8caedf0..4436f46a5 100644
--- a/src/prelaunch/cavrn.cheat.a
+++ b/src/prelaunch/cavrn.cheat.a
@@ -8,10 +8,10 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         ldy   #0
--        lda   callback, y
-         sta   $110, y
-         iny
+         ldy   #(callback_e-callback)
+-        lda   callback-1, y
+         sta   $10f, y
+         dey
          bne   -
          jmp   $110
 
@@ -83,3 +83,4 @@ noaccel
          +READ_ROM_NO_WRITE
          rts
 }
+callback_e
diff --git a/src/prelaunch/conquering.worlds.a b/src/prelaunch/conquering.worlds.a
index f32cb1b4d..e351034b5 100644
--- a/src/prelaunch/conquering.worlds.a
+++ b/src/prelaunch/conquering.worlds.a
@@ -54,8 +54,13 @@ callback2
 +        cpx   #6
          bne   ++
          cmp   #$0D
-         bne   ++
+         bne   +++
          sty   $400E       ; fix reset vector
++++      cmp   #6
+         bne   ++
+         sty   $47B6
+         dey
+         sty   $47B1       ; fix reset vector
 ++       clc
          rts
 
diff --git a/src/prelaunch/demonic.decks.a b/src/prelaunch/demonic.decks.a
index a0fc22fdc..0a14ac0fa 100644
--- a/src/prelaunch/demonic.decks.a
+++ b/src/prelaunch/demonic.decks.a
@@ -11,7 +11,6 @@
          lda   #$60
          sta   $206A
          jsr   $2000      ; decompress
-         +NEW_RESET_VECTOR $BFF0
          +READ_RAM2_NO_WRITE
          lda   MachineStatus
          and   #CHEATS_ENABLED
@@ -22,7 +21,7 @@
 +
          jsr   DisableAccelerator
          +READ_ROM_NO_WRITE
-         jmp   $200
+         jmp   $200       ; no reset vector, code in $3Fx
 
 !if * > $1C0 {
   !error "code is too large, ends at ", *