diff --git a/res/GAMES.CONF b/res/GAMES.CONF index fd1b1d36f..7aab7bc12 100755 --- a/res/GAMES.CONF +++ b/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 diff --git a/res/TITLE.DHGR/ANGRYBIRDS b/res/TITLE.DHGR/ANGRYBIRDS new file mode 100644 index 000000000..90777829f Binary files /dev/null and b/res/TITLE.DHGR/ANGRYBIRDS differ diff --git a/res/TITLE.HGR/ANGRYBIRDS b/res/TITLE.HGR/ANGRYBIRDS deleted file mode 100644 index 1fd8dcc73..000000000 Binary files a/res/TITLE.HGR/ANGRYBIRDS and /dev/null differ diff --git a/res/dsk/apple panic 17k file PRODOS (san inc pack).po b/res/dsk/apple panic 12k file PRODOS (san inc pack).po similarity index 90% rename from res/dsk/apple panic 17k file PRODOS (san inc pack).po rename to res/dsk/apple panic 12k file PRODOS (san inc pack).po index fdaa5af65..8a7c28a48 100644 Binary files a/res/dsk/apple panic 17k file PRODOS (san inc pack).po and b/res/dsk/apple panic 12k file PRODOS (san inc pack).po differ diff --git a/res/dsk/spy vs spy PRODOS (san inc pack).po b/res/dsk/spy vs spy PRODOS (san inc pack).po index 461f40a16..768746efe 100644 Binary files a/res/dsk/spy vs spy PRODOS (san inc pack).po and b/res/dsk/spy vs spy PRODOS (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index fa1bb105f..c5a895943 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 15463596 + !be24 15468090 !le16 5112 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 24a1b09da..e0d4cbcf3 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 15408875 + !be24 15413369 !le16 5695 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 19b4b8f1e..ddb090fb7 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 15341795 + !be24 15346289 !le16 4043 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index a89f9ae93..27238a127 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 15356042 + !be24 15360536 !le16 4508 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 44e407d3a..df4f24f57 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 15374202 + !be24 15378696 !le16 5840 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index bc68d0f3a..298f334c9 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 15395051 + !be24 15399545 !le16 6466 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 6bf9ec0b8..ff89cd90e 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 15468708 + !be24 15473202 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index f1d714280..4f285d36f 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 15469462 + !be24 15473956 !le16 449 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index b08ba4a47..0e45616fc 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 15469911 + !be24 15474405 !le16 303 diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a index bc618e4bc..3b0c5beb8 100644 --- a/src/index/demo.idx.a +++ b/src/index/demo.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 12312462 + !be24 12321166 !le16 1652 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 958b4c388..f4d2d6f0b 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 15417210 + !be24 15421704 !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index d47af1470..e45143b8a 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 15469194 + !be24 15473688 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 1fc9477ed..e260d64f3 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 15463537 + !be24 15468031 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 53481171b..406ce43b9 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 15461993 + !be24 15466487 !le16 1426 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index afeb7e681..77572e699 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 15446202 - !le16 540 + !be24 15450679 + !le16 557 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 39683b49e..44da0e7eb 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 15414570 + !be24 15419064 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 6ee35f63f..ec2febacf 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 15419208 + !be24 15423702 !le16 7358 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 2cea5f0d1..10d10b768 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 15469118 + !be24 15473612 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 68829379c..354c71964 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 15463419 + !be24 15467913 !le16 118 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 72c44d1d5..fed976c43 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 15469261 + !be24 15473755 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index a848b9890..5f8e8818e 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 15446742 + !be24 15451236 !le16 4922 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 407af3dfe..5fc332b8c 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 15451664 + !be24 15456158 !le16 1775 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 76deeac8b..dd69b91ae 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 15453439 + !be24 15457933 !le16 1181 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 2e17c6b0a..a678b562e 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 15454620 + !be24 15459114 !le16 3421 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index e747e92a2..3cbabb205 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 15458041 + !be24 15462535 !le16 3359 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index e0aa76dfe..4078217d6 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 15461400 + !be24 15465894 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 9cdeee594..75b45230a 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 15461879 + !be24 15466373 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index ef4a7faa9..600399d69 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 15470214 + !be24 15474708 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 200485b0a..e2d633ff5 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 15431940 + !be24 15436434 !le16 4962 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index f7cb33d74..cd41cee3a 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 15436902 + !be24 15441396 !le16 2400 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index a5f75e5fc..7f6fc543b 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 15401517 + !be24 15406011 !le16 7358 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index a48089320..fe3581d3d 100644 --- a/src/index/res.cover.idx.a +++ b/src/index/res.cover.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4156928 + !be24 4165632 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 6f71b57e2..37d63ad07 100644 --- a/src/index/res.help.idx.a +++ b/src/index/res.help.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4173312 + !be24 4182016 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index dedf80517..760d485b7 100644 --- a/src/index/res.title.idx.a +++ b/src/index/res.title.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 4165120 + !be24 4173824 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 2c344b4cd..91caa3215 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 15332528 + !be24 15337022 !le16 9267 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index d87af1206..bbc3dfb33 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 15345838 + !be24 15350332 !le16 10204 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 79a416980..413f4146c 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 15360550 + !be24 15365044 !le16 13652 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index be1181abf..39c564bb7 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 15380042 + !be24 15384536 !le16 15009 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 8dccb6621..c98bca16c 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 15418850 + !be24 15423344 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 3acd5caa4..9208651e4 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 15426566 + !be24 15431060 !le16 5374 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 2b1ae5dfb..bb3f4f4dd 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 15439302 - !le16 6900 + !be24 15443796 + !le16 6883 diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a index 20e809ac1..96decdb7f 100644 --- a/src/index/xsingle.idx.a +++ b/src/index/xsingle.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 15328310 + !be24 15332804 !le16 4218 diff --git a/src/prelaunch/apple.panic.a b/src/prelaunch/apple.panic.a index 28d8ced8f..e4b9548a6 100644 --- a/src/prelaunch/apple.panic.a +++ b/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 - sta $819D + lda #$4C + 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 + diff --git a/src/prelaunch/bandits.a b/src/prelaunch/bandits.a index 4effd6ffd..db5ea47ec 100644 --- a/src/prelaunch/bandits.a +++ b/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 $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