From e92c1b32bfc70cf194990c362e7a68911c45b4cd Mon Sep 17 00:00:00 2001
From: Peter Ferrie <peter.ferrie@gmail.com>
Date: Tue, 6 Dec 2022 13:02:24 -0800
Subject: [PATCH] fix UltraWarp crash due to Wavy Navy

---
 src/demo/wavy.navy.a         | 3 +++
 src/index/artwork.idx.a      | 2 +-
 src/index/attract.idx.a      | 2 +-
 src/index/cache00.idx.a      | 2 +-
 src/index/cache01.idx.a      | 2 +-
 src/index/cache10.idx.a      | 2 +-
 src/index/cache11.idx.a      | 2 +-
 src/index/coverfade.idx.a    | 2 +-
 src/index/credits.idx.a      | 2 +-
 src/index/decrunch.idx.a     | 2 +-
 src/index/demo.idx.a         | 2 +-
 src/index/dfx.idx.a          | 2 +-
 src/index/dgr.fizzle.idx.a   | 2 +-
 src/index/dgr.idx.a          | 2 +-
 src/index/dhgr.idx.a         | 2 +-
 src/index/dtitle.idx.a       | 2 +-
 src/index/fx.idx.a           | 2 +-
 src/index/gamehelp.idx.a     | 2 +-
 src/index/gr.fizzle.idx.a    | 2 +-
 src/index/gr.idx.a           | 2 +-
 src/index/helptext.idx.a     | 2 +-
 src/index/hgr0.idx.a         | 2 +-
 src/index/hgr1.idx.a         | 2 +-
 src/index/hgr2.idx.a         | 2 +-
 src/index/hgr3.idx.a         | 2 +-
 src/index/hgr4.idx.a         | 2 +-
 src/index/hgr5.idx.a         | 2 +-
 src/index/hgr6.idx.a         | 2 +-
 src/index/joystick.idx.a     | 2 +-
 src/index/miniattract0.idx.a | 2 +-
 src/index/miniattract1.idx.a | 2 +-
 src/index/prelaunch.idx.a    | 2 +-
 src/index/search00.idx.a     | 2 +-
 src/index/search01.idx.a     | 2 +-
 src/index/search10.idx.a     | 2 +-
 src/index/search11.idx.a     | 2 +-
 src/index/sfx.idx.a          | 2 +-
 src/index/slideshow.idx.a    | 2 +-
 src/index/title.idx.a        | 2 +-
 src/index/xsingle.idx.a      | 2 +-
 src/prelaunch/wavy.navy.a    | 3 +++
 41 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/demo/wavy.navy.a b/src/demo/wavy.navy.a
index c5eeabc55..91c453017 100644
--- a/src/demo/wavy.navy.a
+++ b/src/demo/wavy.navy.a
@@ -24,6 +24,9 @@
          stx   $6B22
          stx   $084C
 
+         lda   #$d0       ; disable alt-palette access
+         sta   $AE8       ; otherwise UltraWarp dies
+
          +DISABLE_ACCEL
 
          jmp   $800
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index 24034fb69..e9a80c671 100644
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15212614
+         !be24  15212575
          !le16     5129
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 07a84b6c2..ef34797b6 100644
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15159073
+         !be24  15159034
          !le16     5642
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 9c4906cf3..8055906cd 100644
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15093593
+         !be24  15093554
          !le16     4012
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index a9c5778fe..c5c9bbf01 100644
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15107720
+         !be24  15107681
          !le16     4431
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 5544fd2c0..2a086c415 100644
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15125423
+         !be24  15125384
          !le16     5651
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 8466af601..019703c45 100644
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15145669
+         !be24  15145630
          !le16     6267
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index 4a06750cd..9980148ba 100644
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15217743
+         !be24  15217704
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index bee69b483..edc3ca61c 100644
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15218497
+         !be24  15218458
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 080fed508..d175a2331 100644
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15218945
+         !be24  15218906
          !le16      303
diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a
index 26ef35582..eb2c81155 100644
--- a/src/index/demo.idx.a
+++ b/src/index/demo.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  12172984
+         !be24  12172945
          !le16     1652
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index daf182613..f9db19d47 100644
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15167355
+         !be24  15167316
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 1ef277172..d39a45011 100644
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15218229
+         !be24  15218190
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index 18d267d52..0df90ce41 100644
--- a/src/index/dgr.idx.a
+++ b/src/index/dgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15212555
+         !be24  15212516
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 07d4eee72..8b1729f9d 100644
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15211021
+         !be24  15210982
          !le16     1437
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index 844ad6e68..8ccdcfe50 100644
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15195625
+         !be24  15195586
          !le16      537
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index 2b4ddd903..ead7f455d 100644
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15164715
+         !be24  15164676
          !le16     2640
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 585dfa552..337c330cd 100644
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15169353
+         !be24  15169314
          !le16     7137
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index f475139bf..d45999f24 100644
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15218153
+         !be24  15218114
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index 48968d33a..1b08f9b86 100644
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15212458
+         !be24  15212419
          !le16       97
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index 54687d8a7..5222309de 100644
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15218296
+         !be24  15218257
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index 1e6dd0dd6..ff4648ebf 100644
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15196162
+         !be24  15196123
          !le16     4702
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index 6561b5a1d..ad62cfab3 100644
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15200864
+         !be24  15200825
          !le16     1715
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index e636ca294..9eb787c4f 100644
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15202579
+         !be24  15202540
          !le16     1129
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index 005dd9bc7..dc07c8954 100644
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15203708
+         !be24  15203669
          !le16     3388
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 7be792c48..5a6e760fd 100644
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15207096
+         !be24  15207057
          !le16     3332
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index 437a33cbe..eb0abdb49 100644
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15210428
+         !be24  15210389
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index 47b3b9b49..823754cc2 100644
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15210907
+         !be24  15210868
          !le16      114
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 7890cb64a..90a7672aa 100644
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15219248
+         !be24  15219209
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index 394ce9a11..afadd335e 100644
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15181802
+         !be24  15181763
          !le16     4741
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 73691a01f..1c4b09ea7 100644
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15186543
+         !be24  15186504
          !le16     2400
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index e2c658aae..977e9980e 100644
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15151936
+         !be24  15151897
          !le16     7137
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index 69ef5a826..a00899b78 100644
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15084352
+         !be24  15084313
          !le16     9241
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index d3eb85442..42be82caa 100644
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15097605
+         !be24  15097566
          !le16    10115
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index 1a7b65ab4..122796040 100644
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15112151
+         !be24  15112112
          !le16    13272
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index 7f8207b5a..2f619c6a7 100644
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15131074
+         !be24  15131035
          !le16    14595
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index f10d4a1fb..cb14d266e 100644
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15168995
+         !be24  15168956
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index c807b5daf..e62cee434 100644
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15176490
+         !be24  15176451
          !le16     5312
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index 869630710..3285ab676 100644
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15188943
+         !be24  15188904
          !le16     6682
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index d0a7bc46b..8e00a213d 100644
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15080383
+         !be24  15080344
          !le16     3969
diff --git a/src/prelaunch/wavy.navy.a b/src/prelaunch/wavy.navy.a
index b7ee05b7f..e9378b0fb 100644
--- a/src/prelaunch/wavy.navy.a
+++ b/src/prelaunch/wavy.navy.a
@@ -16,6 +16,9 @@
          beq   +
          dec   $1e65      ; patch - don't decrease lives
 +
+         lda   #$d0       ; disable alt-palette access
+         sta   $AE8       ; otherwise UltraWarp dies
+
          +DISABLE_ACCEL
          jmp   $800