diff --git a/res/ATTRACT.CONF b/res/ATTRACT.CONF
index cad2a9a45..e9e7ba88e 100644
--- a/res/ATTRACT.CONF
+++ b/res/ATTRACT.CONF
@@ -423,7 +423,7 @@ SHR21.CONF=5
 SIERRA2.CONF=1
 DUNG.BEETLES=0
 MNO5.CONF=1
-SPIDER.RAID=0
+#SPIDER.RAID=0
 ACTIONPOP3.CONF=2
 SHR46.CONF=5
 EFG4.CONF=1
diff --git a/res/ATTRACT/SPIDER.RAID b/res/ATTRACT/SPIDER.RAID
index ed7d55305..1ba2c1874 100644
--- a/res/ATTRACT/SPIDER.RAID
+++ b/res/ATTRACT/SPIDER.RAID
@@ -5,6 +5,5 @@
 
 SPIDER.RAID=C
 SPIDER.RAID=A
-SPIDER.RAID=0
 
 [eof]
diff --git a/src/hw.joystick.a b/src/hw.joystick.a
index 1260eee86..813c23f09 100644
--- a/src/hw.joystick.a
+++ b/src/hw.joystick.a
@@ -16,7 +16,6 @@
 ; Fastchip firmware 0.4b-compatibility fix by Frank M. (0.5b seems unaffected)
 ;------------------------------------------------------------------------------
 HasJoystick
-
          lda   $FBB3
          cmp   #$06
          bne   ++
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index 04cad9e6b..3a4cb9857 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  11974220
+         !be24  11974190
          !le16     5157
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 1683d8ae2..bd2a424ba 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  11925242
-         !le16     5343
+         !be24  11925227
+         !le16     5328
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 8730e6219..12856f957 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  11865382
+         !be24  11865367
          !le16     3654
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index b8dc3ba4a..00e722c53 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  11878230
+         !be24  11878215
          !le16     4074
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 7fab01b58..00c204a91 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  11894317
+         !be24  11894302
          !le16     5245
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 86213b0cb..10e9558bc 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  11912898
+         !be24  11912883
          !le16     5880
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index bf8838609..d89bc9f73 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  11979377
+         !be24  11979347
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index 8a63892d3..5fd5533dc 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  11980131
+         !be24  11980101
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 7a7c709fe..8cb6014ef 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  11980579
+         !be24  11980549
          !le16      303
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index 1ce3157f9..172d9625b 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  11932731
+         !be24  11932701
          !le16     1242
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 99ba4b0dc..bfd5fd341 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  11979863
+         !be24  11979833
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index d754f0d36..2f421eb3f 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  11974161
+         !be24  11974131
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 351be4ea1..5029d8442 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  11972627
+         !be24  11972597
          !le16     1437
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index a1e5ead60..ec39adbe6 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  11958228
+         !be24  11958198
          !le16      537
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index 5e71b4c99..7603b2611 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  11930585
+         !be24  11930555
          !le16     2146
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 9c6ff37ad..bb76280ce 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  11934331
+         !be24  11934301
          !le16     6464
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index d20a35bb1..610c389b3 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  11979787
+         !be24  11979757
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index 43a919a08..309656b13 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  11974064
+         !be24  11974034
          !le16       97
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index bf1f3e876..830bc858e 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  11979930
+         !be24  11979900
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index ee404ce75..65d336caf 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  11958765
+         !be24  11958735
          !le16     4511
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index 2a7b541b1..f94d199d7 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  11963276
+         !be24  11963246
          !le16     1591
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index e87c6cd84..c6df05c1e 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  11964867
+         !be24  11964837
          !le16     1053
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index 75bc27fe1..2ef8eff9f 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  11965920
+         !be24  11965890
          !le16     3237
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 50e1c5c94..05d0a83e5 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  11969157
+         !be24  11969127
          !le16     2877
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index bbce7ff77..61c31e1df 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  11972034
+         !be24  11972004
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index e6e45f400..c9250c64f 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  11972513
+         !be24  11972483
          !le16      114
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index 17ca20b4f..21eac53e7 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  11980882
+         !be24  11980852
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index 261de5675..dbe47cc1d 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  11945751
+         !be24  11945721
          !le16     4283
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index 89bb15c38..5459fa4ab 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  11950034
+         !be24  11950004
          !le16     2185
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index d4f7729fd..a54d205b2 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  11918778
+         !be24  11918763
          !le16     6464
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index 07beca80e..193e36800 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  11857062
+         !be24  11857047
          !le16     8320
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 33783f9d4..6c6d1e107 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  11869036
+         !be24  11869021
          !le16     9194
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index 1e8da4b21..766d682d9 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  11882304
+         !be24  11882289
          !le16    12013
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index 9db451776..d82447205 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  11899562
+         !be24  11899547
          !le16    13336
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index 82e20ccb1..39205385f 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  11933973
+         !be24  11933943
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index fe20b1fbb..acb5cc559 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  11940795
+         !be24  11940765
          !le16     4956
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index 78d459f05..4c6f1c41a 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  11952219
+         !be24  11952189
          !le16     6009