Merge branch 'main' of https://github.com/a2-4am/4cade

res/GAMES.CONF

@@ -45,7 +45,7 @@
 0000,ARCHON.II=Archon II
 1000,ARCTIC.FOX=Arctic Fox
 0001,AA=Ardy the Aardvark
-1000,ARENA=Arena
+1001,ARENA=Arena
 0000,ARGOS=Argos
 1001,ARKANOID=Arkanoid
 1000,ARTESIANS=Artesians
@@ -60,7 +60,7 @@
 0000,BY=Bats in the Belfry
 0001,BATTLE.CRUISER=Battle Cruiser
 0001,BATTLEZONE=Battlezone
-0000,BEACH.LANDING=Beach Landing
+0001,BEACH.LANDING=Beach Landing
 0000,B1=Beach-Head
 0000,B2=Beach-Head II
 0001,BEER.RUN=Beer Run
@@ -86,7 +86,7 @@
 1001,BUBBLE.BOBBLE=Bubble Bobble
 0001,BR=Buck Rogers: Planet of Zoom
 0001,BUG.ATTACK=Bug Attack
-0000,BUG.BATTLE=Bug Battle
+0001,BUG.BATTLE=Bug Battle
 0003,BU=BurgerTime
 0001,BUZZARD.BAIT=Buzzard Bait
 0000,CV=C'est La Vie

src/prelaunch/arena.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by Frank M.
+;(c) 2021-2022 by Frank M., qkumba
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/ARENA",plain
@@ -11,7 +11,16 @@
          lda   #$60
          sta   $9490
          jsr   $6000      ; decompress
-         +DISABLE_ACCEL
+         +READ_RAM2_NO_WRITE
+         lda   MachineStatus
+         and   #CHEATS_ENABLED
+         beq   +
+         lda   #$ad
+         sta   $1713      ; patch - don't decrease lives
+         sta   $173B      ; patch - don't decrease lives
++
+         jsr   DisableAccelerator
+         +READ_ROM_NO_WRITE
 
          jmp   $80D       ; skip changing the reset vector
 

src/prelaunch/beach.landing.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2021 by qkumba
+;(c) 2021-2022 by qkumba
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/BEACH.LANDING",plain
@@ -44,9 +44,22 @@ skip
          sta   $B7B8
          lda   #>callback
          sta   $B7B9
+         lda   #<callback2
+         sta   $B733
+         lda   #>callback2
+         sta   $B734
          +DISABLE_ACCEL
          jmp   $B700
 
+callback2
+         +GET_MACHINE_STATUS
+         and   #CHEATS_ENABLED
+         beq   +
+         lda   #$a5
+         sta   $995       ; patch - don't decrease lives
++
+         jmp   $800
+
 !if * > $1C0 {
   !error "code is too large, ends at ", *
 }

src/prelaunch/bug.battle.a

@@ -0,0 +1,28 @@
+;license:MIT
+;(c) 2022 by qkumba
+
+!cpu 6502
+!to "build/PRELAUNCH.INDEXED/BUG.BATTLE",plain
+*=$106
+
+    !source "src/prelaunch/common.a"
+
+         +ENABLE_ACCEL
+         lda   #$60
+         sta   $9468
+         jsr   $6400      ; decompress
+         +READ_RAM2_NO_WRITE
+         lda   MachineStatus
+         and   #CHEATS_ENABLED
+         beq   +
+         lda   #$bd
+         sta   $78F2      ; patch - don't decrease lives
++
+         jsr   DisableAccelerator
+         +READ_ROM_NO_WRITE
+
+         jmp   $447
+
+!if * > $1C0 {
+  !error "code is too large, ends at ", *
+}