From dc021b45d3d0cda52637bf3515e9acf894671aca Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Fri, 29 Oct 2021 12:14:48 -0700
Subject: [PATCH] fix prelaunch race condition

---
 src/prelaunch/standard.a | 14 ++++++--------
 src/ui.attract.mode.a    |  1 +
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/prelaunch/standard.a b/src/prelaunch/standard.a
index eee2ae0c2..505881f0a 100644
--- a/src/prelaunch/standard.a
+++ b/src/prelaunch/standard.a
@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2019 by qkumba
+;(c) 2021 by qkumba
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/STANDARD",plain
@@ -7,17 +7,15 @@
 
          !source "src/constants.a"
 
-         ldy   ldrhi2                ; set up game entry point in stack page
-         ldx   ldrlo2                ; (last ProRWTS load address - 1)
-         stx   $1FE
-         sty   $1FF
+         lda   ldrhi2                ; set up game entry point in stack page
+         pha
+         lda   ldrlo2                ; last ProRWTS load address
+         pha
 
          !source "src/prelaunch/common.a"
 
-         ldx   #$FD                  ; Jump to game entry point via stack pop.
-         txs
          php
-         rti
+         rti                         ; Jump to game entry point via stack pop.
 
 !if * > $1C0 {
   !error "code is too large, ends at ", *
diff --git a/src/ui.attract.mode.a b/src/ui.attract.mode.a
index df3ca1b37..b09b8931a 100644
--- a/src/ui.attract.mode.a
+++ b/src/ui.attract.mode.a
@@ -90,6 +90,7 @@ MiniAttractMode
          stx   @MiniAttractIndex+1
          stx   @MiniAttractIndex+3
 @loop
+         jsr   SwitchToBank2
          jsr   resetRoot
          jsr   LoadIndexedFile
          !word kAttractModeFulFile