convert some demos to use TOTAL.DATA

2022-09-10 01:36:52 -04:00 · 2022-09-10 01:36:52 -04:00 · 1715a6f866
parent d1a78f6de1
commit 1715a6f866
81 changed files with 159 additions and 179 deletions
--- a/res/DEMO/LAZER.SILK
+++ b/res/DEMO/LAZER.SILK
--- a/res/DEMO/LOST.TOMB
+++ b/res/DEMO/LOST.TOMB
--- a/res/DEMO/MOON.PATROL
+++ b/res/DEMO/MOON.PATROL
--- a/res/DEMO/N.O.R.A.D
+++ b/res/DEMO/N.O.R.A.D
--- a/res/DEMO/NIBBLER
+++ b/res/DEMO/NIBBLER
--- a/res/DEMO/OM
+++ b/res/DEMO/OM
--- a/res/DEMO/PACMAN
+++ b/res/DEMO/PACMAN
--- a/res/DEMO/PEST.PATROL
+++ b/res/DEMO/PEST.PATROL
--- a/res/DEMO/PHASER.FIRE
+++ b/res/DEMO/PHASER.FIRE
--- a/res/DEMO/PITFALL.II
+++ b/res/DEMO/PITFALL.II
--- a/res/DEMO/POOYAN
+++ b/res/DEMO/POOYAN
--- a/res/DEMO/SNAKE.BYTE
+++ b/res/DEMO/SNAKE.BYTE
--- a/res/DEMO/SNEAKERS
+++ b/res/DEMO/SNEAKERS
--- a/res/DEMO/SPACE.EGGS
+++ b/res/DEMO/SPACE.EGGS
--- a/res/DEMO/SPACE.QUARKS
+++ b/res/DEMO/SPACE.QUARKS
--- a/res/DEMO/SPIDER.RAID
+++ b/res/DEMO/SPIDER.RAID
--- a/res/DEMO/SPY.HUNTER
+++ b/res/DEMO/SPY.HUNTER
--- a/res/DEMO/STAR.BLAZER
+++ b/res/DEMO/STAR.BLAZER
--- a/res/DEMO/STARGATE
+++ b/res/DEMO/STARGATE
--- a/res/DEMO/TUNNEL.TERROR
+++ b/res/DEMO/TUNNEL.TERROR
--- a/res/DEMO/WAVY.NAVY
+++ b/res/DEMO/WAVY.NAVY
--- a/res/GAMES.CONF
+++ b/res/GAMES.CONF
@ -245,14 +245,14 @@
 00011,LA=Lamb Chops!
 00010,LANCASTER=Lancaster
 10001,LASER.BOUNCE=Laser Bounce
-00010,LAZER.SILK=Lazer Silk
+00011,LAZER.SILK=Lazer Silk
 00070,LEMMINGS=Lemmings
 00010,LEMM.SIR=Lemmings (Sirius)
 00010,LL=Lethal Labyrinth
 00000,LP=Little Computer People
 00011,LC=Lock 'n' Chase
 00070,LODE.RUNNER=Lode Runner
-10030,LOST.TOMB=Lost Tomb
+10031,LOST.TOMB=Lost Tomb
 00001,LUNAR.EXPLORER=Lunar Explorer
 00040,LUNAR.LEEPERS=Lunar Leepers
 00010,M.I.R.V=M I R V
@ -280,32 +280,32 @@
 10060,MT=Mission on Thunderhead
 00010,MONSTER.MASH=Monster Mash
 00011,MZ=Montezuma's Revenge
-00010,MOON.PATROL=Moon Patrol
+00011,MOON.PATROL=Moon Patrol
 00011,MOUSKATTACK=Mouskattack
 00010,MC=Mr. Cool
 10010,MD=Mr. Do!
 10011,MR=Mr. Robot
 00011,MP=Ms. Pacman
 00010,MUTANT=Mutant
-00000,N.O.R.A.D=N O R A D
+00001,N.O.R.A.D=N O R A D
 00001,NARNIA=Narnia
 00040,NEON=Neon
 00011,NEPTUNE=Neptune
 00071,NT=Neut Tower
 10000,NEUTRONS=Neutrons
-00040,NIBBLER=Nibbler
+00041,NIBBLER=Nibbler
 00001,NIGHT.CRAWLER=Night Crawler
 00070,NM=Night Mission Pinball
 00010,NIGHT.STALKER=Night Stalker
 00010,NI=Nightmare Gallery
-00010,OM=O'Riley's Mine
+00011,OM=O'Riley's Mine
 00010,OID.ZONE=Oid Zone
 10010,OI=Oil's Well
 00071,ORBITRON=Orbitron
 00000,OW=Out of This World
 00011,OUTPOST=Outpost
 00001,OUTWORLD=Outworld
-00010,PACMAN=Pacman
+00011,PACMAN=Pacman
 10001,PAIPEC=Paipec
 00011,PB=Pandora's Box
 01010,PAPERBOY=Paperboy
@ -314,24 +314,24 @@
 10010,PENETRATOR=Penetrator
 00010,PENGO=Pengo
 10010,PENTAPUS=Pentapus
-00010,PEST.PATROL=Pest Patrol
+00011,PEST.PATROL=Pest Patrol
 10011,PHANTOMS.FIVE=Phantoms Five
 00010,PR=Pharaoh's Revenge
-00010,PHASER.FIRE=Phaser Fire
+00011,PHASER.FIRE=Phaser Fire
 00001,PHOTAR=Photar
 00051,PICNIC.PARANOIA=Picnic Paranoia
 00010,PM=Pie-Man
 00011,PIG.PEN=Pig Pen
 10031,PILL.BOX=Pill Box
 01150,PIPE.DREAM=Pipe Dream
-10000,PITFALL.II=Pitfall II
+10001,PITFALL.II=Pitfall II
 00001,PITSTOP.II=Pitstop II
 10001,PLANET.PROTECTR=Planet Protector
 10011,PLANETOIDS=Planetoids
 00010,PLASMANIA=Plasmania
 11110,PLATOON=Platoon
 10001,POLLYWOG=Pollywog
-00010,POOYAN=Pooyan
+00011,POOYAN=Pooyan
 01140,PP=Prince of Persia
 00010,PULSAR.II=Pulsar II
 00011,QUASAR=Quasar
@ -378,13 +378,13 @@
 00060,SC=Situation Critical
 10060,SKYFOX=Skyfox
 00011,SNACK.ATTACK=Snack Attack
-00010,SNAKE.BYTE=Snake Byte
-00010,SNEAKERS=Sneakers
+00011,SNAKE.BYTE=Snake Byte
+00011,SNEAKERS=Sneakers
 00071,SNOGGLE=Snoggle
 01100,SO=Soko-Ban
-10000,SPACE.EGGS=Space Eggs
+10001,SPACE.EGGS=Space Eggs
 00001,SPACE.KADET=Space Kadet
-00010,SPACE.QUARKS=Space Quarks
+00011,SPACE.QUARKS=Space Quarks
 00001,SPACE.RACE=Space Race
 00001,SPACE.RAIDERS=Space Raiders
 10041,SPACE.RESCUE=Space Rescue
@ -392,17 +392,17 @@
 00070,SPARE.CHANGE=Spare Change
 00010,SPECTRE=Spectre
 01060,SPELLWIELDER=Spellwielder
-00010,SPIDER.RAID=Spider Raid
+00011,SPIDER.RAID=Spider Raid
 01160,SPIDERBOT=Spiderbot
 10011,SPINDIZZY=Spindizzy
 10030,SPUTNIK.ATTACK=Sputnik Attack
-00010,SPY.HUNTER=Spy Hunter
+00011,SPY.HUNTER=Spy Hunter
 00000,SS=Spy vs Spy
 00000,SS2=Spy vs Spy 2
 01100,SS3=Spy vs Spy 3
 00010,SD=Spy's Demise
 10001,STAR.AVENGER=Star Avenger
-00040,STAR.BLAZER=Star Blazer
+00041,STAR.BLAZER=Star Blazer
 10001,STAR.CLONES=Star Clones
 10011,STAR.CRUISER=Star Cruiser
 00051,STAR.DANCE=Star Dance
@ -410,7 +410,7 @@
 00011,STAR.THIEF=Star Thief
 10010,STARBALL=Starball
 10011,STARBLASTER=Starblaster
-10030,STARGATE=Stargate
+10031,STARGATE=Stargate
 10060,STARGLIDER=Starglider
 10001,STARMINES=Starmines
 00000,STATION.5=Station 5
@ -459,7 +459,7 @@
 00011,TROMPERS=Trompers
 10041,TSUNAMI=Tsunami
 10070,TB=Tubeway ][
-00010,TUNNEL.TERROR=Tunnel Terror
+00011,TUNNEL.TERROR=Tunnel Terror
 00011,TWERPS=Twerps
 10010,UD=Up'n Down
 01110,VICTORY.ROAD=Victory Road
@ -470,7 +470,7 @@
 00001,WALL.DEFENCE=Wall Defence
 00010,WARGLE=Wargle
 00060,WARP.DESTROYER=Warp Destroyer
-00010,WAVY.NAVY=Wavy Navy
+00011,WAVY.NAVY=Wavy Navy
 00000,WAYOUT=Wayout
 11110,RR=Who Framed Roger Rabbit
 10011,WHOMPER.STOMPER=Whomper Stomper
--- a/src/demo/lazer.silk.a
+++ b/src/demo/lazer.silk.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $404B
@ -55,7 +54,7 @@
         jmp   ($0020)

 title    !byte x_e-x_b
-x_b      !text "X/LAZER.SILK/LAZER.SILK"
+x_b      !text "LAZER.SILK"
 x_e

 !if * > $3F0 {
--- a/src/demo/lost.tomb.a
+++ b/src/demo/lost.tomb.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT lost_tomb, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $82A
@ -67,11 +65,9 @@
         +DISABLE_ACCEL
         jmp   $84D

-lost_tomb
-         !byte lost_tomb_e-lost_tomb_b
-lost_tomb_b
-         !text "X/LOST.TOMB/LOST.TOMB"
-lost_tomb_e
+title    !byte x_e-x_b
+x_b      !text "LOST.TOMB"
+x_e

 !if * > $3F0 {
  !error "code is too large, ends at ", *
--- a/src/demo/moon.patrol.a
+++ b/src/demo/moon.patrol.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $49DD
@ -55,7 +53,7 @@
         jmp   $919

 title    !byte x_e-x_b
-x_b      !text "X/MOON.PATROL/MOON.PATROL"
+x_b      !text "MOON.PATROL"
 x_e

 patch    !byte $20,$B8,$0A,$2C,$10,$C0,$A2,$41,$A9,$FF,$20,$A8,$FC,$AD,$00,$C0,$10,$05,$4C,$00,$01,$EA,$EA,$CA,$D0,$EE
--- a/src/demo/n.o.r.a.d.a
+++ b/src/demo/n.o.r.a.d.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $497E
@ -42,7 +40,7 @@
         jmp   $0EDD

 title    !byte x_e-x_b
-x_b      !text "X/N.O.R.A.D/N.O.R.A.D"
+x_b      !text "N.O.R.A.D"
 x_e

 !if * > $3F0 {
--- a/src/demo/nibbler.a
+++ b/src/demo/nibbler.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $8A19
@ -48,7 +47,7 @@
         jmp   $900

 title    !byte x_e-x_b
-x_b      !text "X/NIBBLER/NIBBLER"
+x_b      !text "NIBBLER"
 x_e

 !if * > $3F0 {
--- a/src/demo/orileys.mine.a
+++ b/src/demo/orileys.mine.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT orileys_mine, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $81D
@ -75,13 +73,12 @@
         stx   $8326

         +DISABLE_ACCEL
+
         jmp   $8FD

-orileys_mine
-         !byte orileys_mine_e-orileys_mine_b
-orileys_mine_b
-         !text "X/OM/OM"
-orileys_mine_e
+title    !byte x_e-x_b
+x_b      !text "OM"
+x_e

 !if * > $3F0 {
  !error "code is too large, ends at ", *
--- a/src/demo/pacman.a
+++ b/src/demo/pacman.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         +NEW_RESET_VECTOR $280

@ -56,7 +55,7 @@
         jmp   $1000

 title    !byte x_e-x_b
-x_b      !text "X/PACMAN/PACMAN"
+x_b      !text "PACMAN"
 x_e

 !if * > $3F0 {
--- a/src/demo/pest.patrol.a
+++ b/src/demo/pest.patrol.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $0837
@ -44,7 +43,7 @@
         jmp   $4003

 title    !byte x_e-x_b
-x_b      !text "X/PEST.PATROL/PEST.PATROL"
+x_b      !text "PEST.PATROL"
 x_e

 patch    !byte $4C,$00,$01,$AD,$00,$C0,$30,$F8,$4C,$90,$B3
--- a/src/demo/phaser.fire.a
+++ b/src/demo/phaser.fire.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $402D
@ -42,9 +40,11 @@
         inx
         stx   $54C2
         stx   $982
+
         +DISABLE_ACCEL
+
         jmp   ($20)

 title    !byte x_e-x_b
-x_b      !text "X/PHASER.FIRE/PHASER.FIRE"
+x_b      !text "PHASER.FIRE"
 x_e
--- a/src/demo/pitfall.ii.a
+++ b/src/demo/pitfall.ii.a
@ -9,9 +9,8 @@
         !source "src/macros.a"

         +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $3D34
@ -75,7 +74,7 @@ p1       lda   patch, x
 patch    !byte $AD,$88,$C0,$6C,$FC,$FF

 title    !byte x_e-x_b
-x_b      !text "X/PITFALL.II/PITFALL.II"
+x_b      !text "PITFALL.II"
 x_e

 !if * > $3F0 {
--- a/src/demo/pooyan.a
+++ b/src/demo/pooyan.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $203A
@ -41,7 +40,7 @@
         jmp   $6000

 title    !byte x_e-x_b
-x_b      !text "X/POOYAN/POOYAN"
+x_b      !text "POOYAN"
 x_e

 !if * > $3F0 {
--- a/src/demo/snake.byte.a
+++ b/src/demo/snake.byte.a
@ -8,9 +8,9 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
         lda   #$B9
         sta   $842
         lda   #$60
@ -40,12 +40,13 @@
         lda   #$2C
         sta   $7A12
         sta   $7A1A
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
         jmp   $7680

 title    !byte x_e-x_b
-x_b      !text "X/SNAKE.BYTE/SNAKE.BYTE"
+x_b      !text "SNAKE.BYTE"
 x_e

 !if * > $3F0 {
--- a/src/demo/sneakers.a
+++ b/src/demo/sneakers.a
@ -8,9 +8,9 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT sneakers, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
         lda   #$60
         sta   $84c7
         jsr   $3ffa      ; decompress
@ -24,13 +24,14 @@
         sta   $4068, x
         dex
         bpl   -
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
         jmp   $9e00

-sneakers
-         !byte 19
-         !text "X/SNEAKERS/SNEAKERS"
+title    !byte x_e-x_b
+x_b      !text "SNEAKERS"
+x_e

 patch    !byte $10,$03,$4C,$00,$01,$EA,$EA,$A9,$00

--- a/src/demo/space.eggs.a
+++ b/src/demo/space.eggs.a
@ -9,9 +9,8 @@
         !source "src/macros.a"

         +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         +NEW_RESET_VECTOR $280

@ -58,7 +57,7 @@
 patch    !byte $CE,$FF,$4B,$10,$03,$4C,$00,$01,$4C,$B0,$4B

 title    !byte x_e-x_b
-x_b      !text "X/SPACE.EGGS/SPACE.EGGS"
+x_b      !text "SPACE.EGGS"
 x_e

 !if * > $3F0 {
--- a/src/demo/space.quarks.a
+++ b/src/demo/space.quarks.a
@ -8,9 +8,9 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT space_quarks, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
         lda   #$4C
         sta   $3EC9
         jsr   $3E65      ; decompress/set reset vector
@ -36,12 +36,13 @@
         sta   $72BD, x
         dex
         bpl   -
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
         jmp   $20A

-space_quarks
-         !byte 27
-         !text "X/SPACE.QUARKS/SPACE.QUARKS"
+title    !byte x_e-x_b
+x_b      !text "SPACE.QUARKS"
+x_e

 patch    !byte $F0,$08,$AD,$00,$C0,$10,$0D,$4C,$00,$01,$CE,$24,$02,$F0,$F8,$68,$68
--- a/src/demo/spider.raid.a
+++ b/src/demo/spider.raid.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT spider_raid, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $3EFD
@ -52,14 +50,14 @@
         stx   $99A7
         sec
         rol   $976A
+
         +DISABLE_ACCEL
+
         jmp   $4246

-spider_raid
-         !byte spider_raid_e-spider_raid_b
-spider_raid_b
-         !text "X/SPIDER.RAID/SPIDER.RAID"
-spider_raid_e
+title    !byte x_e-x_b
+x_b      !text "SPIDER.RAID"
+x_e

 !if * > $3F0 {
  !error "code is too large, ends at ", *
--- a/src/demo/spy.hunter.a
+++ b/src/demo/spy.hunter.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #<(callback - 1)
         sta   $4013
@ -19,7 +17,7 @@
         sta   $4010
         jmp   $4000

-callback 
+callback
         +RESET_AND_IRQ_VECTOR $100
         ldy   #0
         sty   $0D8E
@ -51,9 +49,11 @@ callback
         sta   $E93
         sta   $EB2
         sta   $61C5
+
         +DISABLE_ACCEL
+
         jmp   $0451

 title    !byte x_e-x_b
-x_b      !text "X/SPY.HUNTER/SPY.HUNTER"
+x_b      !text "SPY.HUNTER"
 x_e
--- a/src/demo/star.blazer.a
+++ b/src/demo/star.blazer.a
@ -8,9 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $722A
@ -49,7 +48,7 @@ count    !byte $03
 +        jmp   $1750

 title    !byte x_e-x_b
-x_b      !text "X/STAR.BLAZER/STAR.BLAZER"
+x_b      !text "STAR.BLAZER"
 x_e

 !if * > $3F0 {
--- a/src/demo/stargate.a
+++ b/src/demo/stargate.a
@ -9,9 +9,8 @@
         !source "src/macros.a"

         +GAME_REQUIRES_JOYSTICK
-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #$60
         sta   $4697
@ -62,7 +61,7 @@
         jmp   $5000

 title    !byte x_e-x_b
-x_b      !text "X/STARGATE/STARGATE"
+x_b      !text "STARGATE"
 x_e

 !if * > $3F0 {
--- a/src/demo/tunnel.terror.a
+++ b/src/demo/tunnel.terror.a
@ -8,10 +8,8 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT title, $00
-         +READ_ROM_NO_WRITE
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title

         lda   #1         ; reset vector fix
         sta   $6E13      ; to $3F3
@ -71,7 +69,7 @@
         jmp   $E00

 title    !byte x_e-x_b
-x_b      !text "X/TUNNEL.TERROR/TUNNEL.TERROR"
+x_b      !text "TUNNEL.TERROR"
 x_e

 !if * > $BFD0 {
--- a/src/demo/wavy.navy.a
+++ b/src/demo/wavy.navy.a
@ -8,9 +8,9 @@
         !source "src/constants.a"   ; no code in these
         !source "src/macros.a"

-         +READ_RAM2_WRITE_RAM2
-         jsr   EnableAccelerator
-         +LOAD_FILE_AT wavy_navy, $800
+         +ENABLE_ACCEL
+         +LOAD_XSINGLE title
+
         lda   #$60
         sta   $505d
         jsr   $800       ; decompress
@ -23,13 +23,14 @@
         inx
         stx   $6B22
         stx   $084C
-         jsr   DisableAccelerator
-         +READ_ROM_NO_WRITE
+
+         +DISABLE_ACCEL
+
         jmp   $800

-wavy_navy
-         !byte 21
-         !text "X/WAVY.NAVY/WAVY.NAVY"
+title    !byte x_e-x_b
+x_b      !text "WAVY.NAVY"
+x_e

 patch    !byte $AD,$88,$C0,$6C,$FC,$FF

--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14683433
+         !be24  14994831
         !le16     5108
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14631280
+         !be24  14942678
         !le16     5521
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14567260
+         !be24  14878658
         !le16     3932
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14581099
+         !be24  14892497
         !le16     4354
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14598389
+         !be24  14909787
         !le16     5527
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14618175
+         !be24  14929573
         !le16     6146
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14688541
+         !be24  14999939
         !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  14689295
+         !be24  15000693
         !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  14689743
+         !be24  15001141
         !le16      303
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14639441
+         !be24  14950839
         !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  14689027
+         !be24  15000425
         !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  14683374
+         !be24  14994772
         !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  14681840
+         !be24  14993238
         !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  14667032
+         !be24  14978430
         !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  14636801
+         !be24  14948199
         !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  14641439
+         !be24  14952837
         !le16     6959
--- 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  14688951
+         !be24  15000349
         !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  14683277
+         !be24  14994675
         !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  14689094
+         !be24  15000492
         !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  14667569
+         !be24  14978967
         !le16     4625
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14672194
+         !be24  14983592
         !le16     1702
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14673896
+         !be24  14985294
         !le16     1087
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14674983
+         !be24  14986381
         !le16     3279
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14678262
+         !be24  14989660
         !le16     2985
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14681247
+         !be24  14992645
         !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  14681726
+         !be24  14993124
         !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  14690046
+         !be24  15001444
         !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  14653565
+         !be24  14964963
         !le16     4692
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14658257
+         !be24  14969655
         !le16     2271
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14624321
+         !be24  14935719
         !le16     6959
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14558227
+         !be24  14869625
         !le16     9033
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14571192
+         !be24  14882590
         !le16     9907
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14585453
+         !be24  14896851
         !le16    12936
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14603916
+         !be24  14915314
         !le16    14259
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14641081
+         !be24  14952479
         !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  14648398
+         !be24  14959796
         !le16     5167
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14660528
+         !be24  14971926
         !le16     6504
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
         !byte 0
-         !be24  14554745
-         !le16     3482
+         !be24  14865760
+         !le16     3865