merge

res/GAMES.CONF

@@ -36,7 +36,7 @@
 00011,ALIEN.TYPHOON=Alien Typhoon
 11110,ALIENS=Aliens
 10061,ANGEL.1=Angel-1
-01000,ANGRYBIRDS=Angry Birds
+01100,ANGRYBIRDS=Angry Birds
 00001,ANKH=Ankh
 00010,APE.ESCAPE=Ape Escape
 00010,AC=Apple Cider Spider

src/index/artwork.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15463596
+         !be24  15468090
          !le16     5112

src/index/attract.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15408875
+         !be24  15413369
          !le16     5695

src/index/cache00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15341795
+         !be24  15346289
          !le16     4043

src/index/cache01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15356042
+         !be24  15360536
          !le16     4508

src/index/cache10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15374202
+         !be24  15378696
          !le16     5840

src/index/cache11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15395051
+         !be24  15399545
          !le16     6466

src/index/coverfade.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15468708
+         !be24  15473202
          !le16      410

src/index/credits.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15469462
+         !be24  15473956
          !le16      449

src/index/decrunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15469911
+         !be24  15474405
          !le16      303

src/index/demo.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  12312462
+         !be24  12321166
          !le16     1652

src/index/dfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15417210
+         !be24  15421704
          !le16     1640

src/index/dgr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15469194
+         !be24  15473688
          !le16       67

src/index/dgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15463537
+         !be24  15468031
          !le16       59

src/index/dhgr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15461993
+         !be24  15466487
          !le16     1426

src/index/dtitle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15446202
+         !be24  15450679
-         !le16      540
+         !le16      557

src/index/fx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15414570
+         !be24  15419064
          !le16     2640

src/index/gamehelp.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15419208
+         !be24  15423702
          !le16     7358

src/index/gr.fizzle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15469118
+         !be24  15473612
          !le16       76

src/index/gr.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15463419
+         !be24  15467913
          !le16      118

src/index/helptext.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15469261
+         !be24  15473755
          !le16      201

src/index/hgr0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15446742
+         !be24  15451236
          !le16     4922

src/index/hgr1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15451664
+         !be24  15456158
          !le16     1775

src/index/hgr2.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15453439
+         !be24  15457933
          !le16     1181

src/index/hgr3.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15454620
+         !be24  15459114
          !le16     3421

src/index/hgr4.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15458041
+         !be24  15462535
          !le16     3359

src/index/hgr5.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15461400
+         !be24  15465894
          !le16      479

src/index/hgr6.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15461879
+         !be24  15466373
          !le16      114

src/index/joystick.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15470214
+         !be24  15474708
          !le16     2370

src/index/miniattract0.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15431940
+         !be24  15436434
          !le16     4962

src/index/miniattract1.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15436902
+         !be24  15441396
          !le16     2400

src/index/prelaunch.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15401517
+         !be24  15406011
          !le16     7358

src/index/res.cover.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  4156928
+         !be24  4165632
          !le16     8192

src/index/res.help.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  4173312
+         !be24  4182016
          !le16     8192

src/index/res.title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  4165120
+         !be24  4173824
          !le16     8192

src/index/search00.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15332528
+         !be24  15337022
          !le16     9267

src/index/search01.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15345838
+         !be24  15350332
          !le16    10204

src/index/search10.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15360550
+         !be24  15365044
          !le16    13652

src/index/search11.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15380042
+         !be24  15384536
          !le16    15009

src/index/sfx.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15418850
+         !be24  15423344
          !le16      358

src/index/slideshow.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15426566
+         !be24  15431060
          !le16     5374

src/index/title.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15439302
+         !be24  15443796
-         !le16     6900
+         !le16     6883

src/index/xsingle.idx.a

@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15328310
+         !be24  15332804
          !le16     4218

src/prelaunch/apple.panic.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2019 by 4am
+;(c) 2019, 2024 by 4am, qkumba
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/APPLE.PANIC",plain
@@ -8,9 +8,15 @@
          !source "src/prelaunch/common.a"
 
          +ENABLE_ACCEL
-         lda   #$60
+         lda   #$4C
-         sta   $819D
+         sta   $7115
+         sta   $7137
          jsr   $3FF8      ; decompress
+         +DISABLE_ACCEL
+         jsr   $1000      ; title sequence
+         +ENABLE_ACCEL
+         jsr   $711B      ; decompress
+
          +GET_MACHINE_STATUS
          and   #CHEATS_ENABLED
          beq   +

src/prelaunch/bandits.a

@@ -1,5 +1,5 @@
 ;license:MIT
-;(c) 2020 by qkumba
+;(c) 2020, 2024 by qkumba
 
 !cpu 6502
 !to "build/PRELAUNCH.INDEXED/BANDITS",plain
@@ -11,20 +11,20 @@
          lda   #$60
          sta   $87A
          jsr   $800       ; decompress
-         +GET_MACHINE_STATUS
-         and   #CHEATS_ENABLED
-         beq   +
          lda   #<callback
          sta   $481
          lda   #>callback
          sta   $482
-+
+
          +DISABLE_ACCEL
          jmp   $8F40
 
 callback
          +ENABLE_ACCEL
          jsr   $4C8       ; decompress
+         +GET_MACHINE_STATUS
+         and   #CHEATS_ENABLED
+         beq   +
          lda   $57
          cmp   #$0F
          bne   +
@@ -34,6 +34,11 @@ callback
          lda   #$AD
          sta   $63AE      ; patch - don't decrease lives
 +
+         lda   #$35       ; map shield to button 1
+         sta   $2AF
+         lda   #2
+         sta   $2B4
+
          +DISABLE_ACCEL
          lda   #0
          rts