diff --git a/src/demo/wavy.navy.a b/src/demo/wavy.navy.a
index 91c453017..deb8b02ed 100644
--- a/src/demo/wavy.navy.a
+++ b/src/demo/wavy.navy.a
@@ -24,8 +24,12 @@
          stx   $6B22
          stx   $084C
 
-         lda   #$d0       ; disable alt-palette access
+         lda   ROM_MACHINEID
+         cmp   #$06
+         bne   +
+         lda   #$d0       ; disable AN1 access on IIe-class
          sta   $AE8       ; otherwise UltraWarp dies
++
 
          +DISABLE_ACCEL
 
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index e9a80c671..7c7153174 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  15212575
+         !be24  15212582
          !le16     5129
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index ef34797b6..aa38e658f 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  15159034
+         !be24  15159041
          !le16     5642
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 8055906cd..022006b19 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  15093554
+         !be24  15093561
          !le16     4012
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index c5c9bbf01..0d1167429 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  15107681
+         !be24  15107688
          !le16     4431
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 2a086c415..8c036eecf 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  15125384
+         !be24  15125391
          !le16     5651
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 019703c45..4c06fadda 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  15145630
+         !be24  15145637
          !le16     6267
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index 9980148ba..e06e3d508 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  15217704
+         !be24  15217711
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index edc3ca61c..692ef3e06 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  15218458
+         !be24  15218465
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index d175a2331..de6991e28 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  15218906
+         !be24  15218913
          !le16      303
diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a
index eb2c81155..20ca92a06 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  12172945
+         !be24  12172952
          !le16     1652
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index f9db19d47..1f57db10c 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  15167316
+         !be24  15167323
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index d39a45011..8b5c8a046 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  15218190
+         !be24  15218197
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index 0df90ce41..0a2f8ac5d 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  15212516
+         !be24  15212523
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 8b1729f9d..2e45736b4 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  15210982
+         !be24  15210989
          !le16     1437
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index 8ccdcfe50..daf3c07f0 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  15195586
+         !be24  15195593
          !le16      537
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index ead7f455d..8c233d32e 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  15164676
+         !be24  15164683
          !le16     2640
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 337c330cd..ec8206865 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  15169314
+         !be24  15169321
          !le16     7137
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index d45999f24..7eac9c8af 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  15218114
+         !be24  15218121
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index 1b08f9b86..08bb2c5fa 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  15212419
+         !be24  15212426
          !le16       97
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index 5222309de..d77cbf909 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  15218257
+         !be24  15218264
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index ff4648ebf..184a04f28 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  15196123
+         !be24  15196130
          !le16     4702
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index ad62cfab3..690a6d777 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  15200825
+         !be24  15200832
          !le16     1715
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index 9eb787c4f..88c45cc2f 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  15202540
+         !be24  15202547
          !le16     1129
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index dc07c8954..90aa3f3ed 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  15203669
+         !be24  15203676
          !le16     3388
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 5a6e760fd..ddeb1867d 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  15207057
+         !be24  15207064
          !le16     3332
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index eb0abdb49..dbef760cf 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  15210389
+         !be24  15210396
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index 823754cc2..c80c7c09d 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  15210868
+         !be24  15210875
          !le16      114
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 90a7672aa..d8b0e2ab2 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  15219209
+         !be24  15219216
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index afadd335e..ee6a709ba 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  15181763
+         !be24  15181770
          !le16     4741
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 1c4b09ea7..fb09d4e72 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  15186504
+         !be24  15186511
          !le16     2400
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index 977e9980e..f5d1e1eb3 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  15151897
+         !be24  15151904
          !le16     7137
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index a00899b78..85094aaa4 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  15084313
+         !be24  15084320
          !le16     9241
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 42be82caa..eba64cf26 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  15097566
+         !be24  15097573
          !le16    10115
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index 122796040..5273151ca 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  15112112
+         !be24  15112119
          !le16    13272
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index 2f619c6a7..b9970c475 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  15131035
+         !be24  15131042
          !le16    14595
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index cb14d266e..08e5029d5 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  15168956
+         !be24  15168963
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index e62cee434..e64a06cb5 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  15176451
+         !be24  15176458
          !le16     5312
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index 3285ab676..373322bff 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  15188904
+         !be24  15188911
          !le16     6682
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index 8e00a213d..a4708529f 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  15080344
+         !be24  15080351
          !le16     3969
diff --git a/src/prelaunch/wavy.navy.a b/src/prelaunch/wavy.navy.a
index e9378b0fb..b8e61a5f8 100644
--- a/src/prelaunch/wavy.navy.a
+++ b/src/prelaunch/wavy.navy.a
@@ -16,9 +16,12 @@
          beq   +
          dec   $1e65      ; patch - don't decrease lives
 +
-         lda   #$d0       ; disable alt-palette access
+         lda   ROM_MACHINEID
+         cmp   #$06
+         bne   +
+         lda   #$d0       ; disable AN1 access on IIe-class
          sta   $AE8       ; otherwise UltraWarp dies
-
++
          +DISABLE_ACCEL
          jmp   $800