some demo cleanup

src/demo/agent.u.s.a.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/AGENT.U.S.A",plain
@@ -23,26 +23,22 @@
          rol   $3F3       ; point to $300 instead
          jsr   $FB6F
 
-         lda   #$EA
-         sta   $15DD
-         sta   $15DD+1
-         sta   $15DD+2    ; disable button press on main menu
-
-         lda   #$4C
-         sta   $0A06
-         sta   $1605
-         inx
-         stx   $0A06+1
-         stx   $1605+1
-         inx
-         stx   $0A06+2
-         stx   $1605+2    ; set exits
+         ldx   #3-1
+-        lda   #$EA
+         sta   $15DD,x    ; disable button press on main menu
+         lda   patch,x
+         sta   $0A06,x
+         sta   $1605,x    ; set exits
+         dex
+         bpl   -      
 
          lda   #$D0
          sta   $AC64      ; disable sound
 
          jmp   $837
 
+patch    !byte $4C,$00,$01
+
 title    !byte x_e-x_b
 x_b      !text "AGENT.U.S.A"
 x_e

src/demo/alien.ambush.a

@@ -8,24 +8,23 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
          +NEW_RESET_VECTOR $3E0      ; overwrites $101 at end of demo cycle
          lda   #$60
          sta   $81c
          jsr   $800       ; decompress
-         lda   #$4C
-         sta   $60CA
-         sta   $6040
-         lda   #$E0
-         sta   $60CB
-         sta   $6041
-         lda   #3
-         sta   $60CC
-         sta   $6042
+         ldx   #3-1
+-        lda   patch,x
+         sta   $60CA,x
+         sta   $6040,x
+         dex
+         bpl   -
          +DISABLE_ACCEL
          jmp   $4000
 
+patch    !byte $4C,$E0,$03
+
 title    !byte x_e-x_b
 x_b      !text "ALIEN.AMBUSH"
 x_e

src/demo/alien.downpour.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by qkumba
+;(c) 2021-2022 by qkumba
 
 !cpu 6502
 !to "res/DEMO/ALIEN.DOWNPOUR",plain
@@ -8,34 +8,27 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
          lda   #$60
          sta   $201f
          jsr   $2000      ; decompress
-         lda   #$4C
-         sta   $868C
-         sta   $7B88
-         sta   $8FDF
-         sta   $902F
-         sta   $9078
-         ldx   #0
-         stx   $868D
-         stx   $7B89
-         stx   $8FE0
-         stx   $9030
-         stx   $9079
-         inx
-         stx   $868E
-         stx   $7B8A
-         stx   $8FE1
-         stx   $9031
-         stx   $907A
+         ldx   #3-1
+-        lda   patch,x
+         sta   $868C,x
+         sta   $7B88,x
+         sta   $8FDF,x
+         sta   $902F,x
+         sta   $9078,x
+         dex
+         bpl   -
          lda   #$D0
          sta   $6E6D
          +DISABLE_ACCEL
          jmp   $73a0
 
+patch    !byte $4C,$00,$01
+
 title    !byte x_e-x_b
 x_b      !text "ALIEN.DOWNPOUR"
 x_e

src/demo/alien.munchies.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/ALIEN.MUNCHIES",plain
@@ -8,7 +8,7 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #$60
@@ -29,7 +29,7 @@
          bpl   -          ; exit on keypress at title screen & during demo
 
          ldx   #3-1
--        lda   patch1-3, x
+-        lda   patch3, x
          sta   $92F, x
          sta   $139F, x
          sta   $1392, x
@@ -46,7 +46,8 @@
 
          jmp   $833
 
-patch1   !byte $30,$05,$AD,$00,$C0,$10,$29,$4C,$00,$01
+patch1   !byte $30,$05,$AD,$00,$C0,$10,$29
+patch3   !byte $4C,$00,$01
 
 patch2   !byte $10,$0A
 

src/demo/alien.typhoon.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M./qkumba
+;(c) 2021-2022 by Frank M./qkumba
 
 !cpu 6502
 !to "res/DEMO/ALIEN.TYPHOON",plain
@@ -8,7 +8,7 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #$61
@@ -36,6 +36,8 @@
          sta   $8FD6,x
          sta   $8FEF,x
          sta   $92B1,x    ; set exits
+         dex
+         bpl   -
 
          +DISABLE_ACCEL
 

src/demo/apple.invader.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/APPLE.INVADER",plain
@@ -12,7 +12,7 @@
 
          lda   $7fe
          pha
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          pla
          sta   $7fe       ; overwritten by GS acceleration
 

src/demo/apple.oids.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/AO",plain
@@ -8,7 +8,7 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #$60

src/demo/aquatron.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/AQUATRON",plain
@@ -8,7 +8,7 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #>(callback - 1)
@@ -18,15 +18,12 @@
          jmp   $59C2      ; decompress
 
 callback
-         lda   #$4C
-         sta   $7AE1
-         sta   $7D1D
-         lda   #0
-         sta   $7AE1+1
-         sta   $7D1D+1
-         lda   #1
-         sta   $7AE1+2
-         sta   $7D1D+2     ; set exits
+         ldx   #3-1
+-        lda   patch,x
+         sta   $7AE1,x
+         sta   $7D1D,x    ; set exits
+         dex
+         bpl   -
 
          lda   #$D0
          sta   $7E11
@@ -38,6 +35,8 @@ callback
 
          jmp   $400
 
+patch    !byte $4C,$00,$01
+
 title    !byte x_e-x_b
 x_b      !text "AQUATRON"
 x_e

src/demo/axis.assassin.a

@@ -8,7 +8,7 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #$84
@@ -22,22 +22,22 @@
          sta   $3f06
          jsr   $3eb1      ; decompress
 
-         lda   #$4C
-         sta   $5B2E
-         sta   $701C
-         sta   $5D5B
-         ldx   #0
-         stx   $5DF4
-         stx   $5CD8
-         stx   $5E09
-         stx   $701D
-         inx
-         stx   $5B30      ; reset vector patch
-         stx   $5DF5
-         stx   $5CD9
-         stx   $5E0A
-         stx   $701E
-         stx   $5D5D
+         ldx   #3-1
+-        lda   patch,x
+         sta   $5B2E,x    ; reset vector patch
+         sta   $701C,x
+         sta   $5D5B,x
+         dex
+         bpl   -
+
+         ldx   #2-1
+-        lda   patch+1,x
+         sta   $5DF4,x
+         sta   $5CD8,x
+         sta   $5E09,x
+         dex
+         bpl   -
+
          lda   #$24
          sta   $5D24
          lda   #$D0
@@ -57,9 +57,10 @@ counter  !byte 5
 callback
          sta   $C010
          dec   counter
-         bpl   +
-         jmp   $100
-+        rts
+         bmi   patch
+         rts
+
+patch    !byte $4C,$00,$01
 
 title    !byte x_e-x_b
 x_b      !text "AXIS.ASSASSIN"

src/demo/battlezone.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/BATTLEZONE",plain
@@ -15,51 +15,31 @@
          sta   $201e
          jsr   $2000      ; decompress
 
-         lda   #0
-         sta   $0811
-         lda   #1
-         sta   $0816      ; reset vector patch
+         ldx   #0
+         stx   $0811
+         inx
+         stx   $0816      ; reset vector patch
 
-         lda   #$EA
-         sta   $1632
-         sta   $1632+1
-         sta   $1632+2    ; disable clearing keyboard strobe
+         ldx   #3-1
+-        lda   #$EA
+         sta   $1632,x    ; disable clearing keyboard strobe
+         lda   patch,x
+         sta   $0872,x
+         sta   $161A,x
+         sta   $7661,x
+         sta   $766C,x
+         sta   $7693,x
+         sta   $0B6A,x
+         sta   $73A7,x
+         sta   $168F+4,x
+         dex
+         bpl   -
 
-         lda   #$4C
-         sta   $0872
-         sta   $161A
-         sta   $7661
-         sta   $766C
-         sta   $7693
-         sta   $0B6A
-         sta   $73A7
-         sta   $168F+4
-         lda   #0
-         sta   $0872+1
-         sta   $161A+1
-         sta   $7661+1
-         sta   $766C+1
-         sta   $7693+1
-         sta   $0B6A+1
-         sta   $73A7+1
-         sta   $168F+5
-         lda   #1
-         sta   $0872+2
-         sta   $161A+2
-         sta   $7661+2
-         sta   $766C+2
-         sta   $7693+2
-         sta   $0B6A+2
-         sta   $73A7+2
-         sta   $168F+6
-         lda   #$C9
-         sta   $168F
-         lda   #$FF
-         sta   $168F+1
-         lda   #$F0
-         sta   $168F+2
-         lda   #$16
-         sta   $168F+3    ; set exits
+         ldx   #4-1
+         lda   patch2,x
+         sta   $168F,x    ; set exits
+         dex
+         bpl   -
 
          lda   #$D0
          sta   $7733
@@ -75,6 +55,9 @@
 
          jmp   $810
 
+patch    !byte $4C,$00,$01
+patch2   !byte $C9,$FF,$F0,$16
+
 title    !byte x_e-x_b
 x_b      !text "BATTLEZONE"
 x_e

src/demo/beer.run.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/BEER.RUN",plain
@@ -10,20 +10,7 @@
 
          +READ_RAM2_WRITE_RAM2
          jsr   EnableAccelerator
-
-;+LOAD_FILE_KEEP_DIR
-         ldx   #0         ; read to main memory
-         stx   ldrhi
-         stx   ldrlo
-         +LDADDR title
-         jsr   iLoadFileDirect
-
-         ldx   #11-1      ; we also need to copy the length byte
--        lda   newpath,x
-         sta   $BFD0,x
-         dex
-         bpl   -
-
+         +LOAD_FILE_KEEP_DIR beer_run, beer_run_dir_e-beer_run_dir_b
          lda   #$60
          sta   $2065
          jsr   $2000      ; decompress1
@@ -32,24 +19,15 @@
          sta   $BB2C
          jsr   $BB00      ; decompress2
 
-         lda   #$4C
-         sta   $419C
-         sta   $6C62
-         sta   $4085
-         sta   $4088
-         lda   #0
-         sta   $419C+1
-         sta   $6C62+1
-         sta   $4085+1
-         lda   #1
-         sta   $419C+2
-         sta   $6C62+2
-         sta   $4085+2    ; set exits
-
-         lda   #<(count+1)
-         sta   $4088+1
-         lda   #>(count+1)
-         sta   $4088+2    ; decrement custom counter after demo cycle and eventually exit
+         ldx   #3-1
+-        lda   patch,x
+         sta   $419C,x
+         sta   $6C62,x
+         sta   $4085,x    ; set exits
+         lda   patch2,x
+         sta   $4088,x    ; decrement custom counter after demo cycle and eventually exit
+         dex
+         bpl   -
 
          lda   #$D0
          sta   $67D1      ; disable sound
@@ -60,17 +38,20 @@
 
 count    !byte $03
          dec   count
-         bpl   +
-         jmp   $100
-+        jmp   $40C8
+         bmi   patch
+         jmp   $40C8
 
-newpath
-         !byte 10
+patch    !byte $4C,$00,$01
+patch2   !byte $4C,<(count+1),>(count+1)
+
+beer_run
+         !byte beer_run_e-beer_run_b
+beer_run_b
+beer_run_dir_b
          !text "X/BEER.RUN"
-
-title    !byte x_e-x_b
-x_b      !text "X/BEER.RUN/BEER.RUN"
-x_e
+beer_run_dir_e
+         !text "/BEER.RUN"
+beer_run_e
 
 !if * > $3F0 {
   !error "code is too large, ends at ", *

src/demo/bellhop.a

@@ -8,33 +8,28 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
          lda   #$60
          sta   $0813
          jsr   $0800      ; decompress
-         lda   #$4C
-         sta   $602F
-         sta   $6BD4
-         sta   $66D2
-         ldx   #0
-         stx   $6030
-         stx   $6BD5
-         inx
-         stx   $6031
-         stx   $6BD6
-         stx   $66D4
-         lda   #$EE
-         sta   $66CA
-         lda   #<counter
-         sta   $66CB
-         lda   #>counter
-         sta   $66CC
+         ldx   #3-1
+-        lda   patch,x
+         sta   $602F,x
+         sta   $6BD4,x
+         sta   $66D2,x
+         lda   patch2,x
+         sta   $66CA,x
+         dex
+         bpl   -
          +DISABLE_ACCEL
          jmp   $6000
 
 counter  !byte $FD
 
+patch    !byte $4C,$00,$01
+patch2   !byte $EE,<counter,>counter
+
 title    !byte x_e-x_b
 x_b      !text "BELLHOP"
 x_e

src/demo/bolo.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/BOLO",plain
@@ -8,25 +8,20 @@
          !source "src/constants.a"   ; no code in these
          !source "src/macros.a"
 
-         +ENABLE_ACCEL
+         +ENABLE_ACCEL_LC
          +LOAD_XSINGLE title
 
          lda   #$60
          sta   $8034
          jsr   $4ab0      ; decompress and show title
 
-         lda   #$4C
-         sta   $129A
-         sta   $15F8
-         sta   $5D8A      ; (later moved to $7D8A)
-         lda   #0
-         sta   $129A+1
-         sta   $15F8+1
-         sta   $5D8A+1
-         lda   #1
-         sta   $129A+2
-         sta   $15F8+2
-         sta   $5D8A+2    ; set exits
+         ldx   #3-1
+-        lda   patch,x
+         sta   $129A,x
+         sta   $15F8,x
+         sta   $5D8A,x    ; (later moved to $7D8A)
+         dex
+         bpl   -          ; set exits
 
          lda   #$D0
          sta   $4E7A      ; (later moved to $6E7A)
@@ -37,6 +32,8 @@
 
          jmp   $1100
 
+patch    !byte $4C,$00,$01
+
 title    !byte x_e-x_b
 x_b      !text "BOLO"
 x_e

src/demo/borg.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "res/DEMO/BORG",plain
@@ -11,18 +11,7 @@
          +READ_RAM2_WRITE_RAM2
          ;jsr   EnableAccelerator    ; can't because of animation
 
-;+LOAD_FILE_KEEP_DIR
-         ldx   #0         ; read to main memory
-         stx   ldrhi
-         stx   ldrlo
-         +LDADDR title
-         jsr   iLoadFileDirect
-
-         ldx   #7-1       ; we also need to copy the length byte
--        lda   newpath,x
-         sta   $BFD0,x
-         dex
-         bpl   -
+         +LOAD_FILE_KEEP_DIR borg, borg_dir_e-borg_dir_b
 
          +READ_ROM_NO_WRITE
 
@@ -30,16 +19,13 @@
          sta   $609E
          jsr   $6000      ; decompress and show animation
 
-         lda   #$4C
-         sta   $8C27      ; exit after 1 cycle
-         sta   $ECA       ; exit on keypress 1 (joysticks not polled)
+         ldx   #3-1
+-        lda   patch2,x
+         sta   $8C27,x    ; exit after 1 cycle
+         sta   $ECA,x     ; exit on keypress 1 (joysticks not polled)
+         dex
+         bpl   -
          sta   $99
-         lda   #0
-         sta   $8C27+1
-         sta   $ECA+1
-         lda   #1
-         sta   $8C27+2
-         sta   $ECA+2
 
          ldx   #7-1
 -        lda   patch, x
@@ -51,14 +37,15 @@
          jmp   $EB0
 
 patch    !byte $30,$F8,$EA,$20,$00,$0F,$60
+patch2   !byte $4C,$00,$01
 
-newpath
-         !byte 6
+borg     !byte borg_e-borg_b
+borg_b
+borg_dir_b
          !text "X/BORG"
-
-title    !byte x_e-x_b
-x_b      !text "X/BORG/BORG"
-x_e
+borg_dir_e
+         !text "/BORG"
+borg_e
 
 !if * > $3F0 {
   !error "code is too large, ends at ", *