fix UltraWarp crash due to Wavy Navy

2024-06-09 17:29:32 +00:00 · 2022-12-06 13:02:24 -08:00 · 2022-12-06 13:02:24 -08:00 · e92c1b32bf
commit e92c1b32bf
parent c5c812754e
41 changed files with 45 additions and 39 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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