diff --git a/res/GAMES.CONF b/res/GAMES.CONF index d2ac6ff69..ba5e49d16 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -121,7 +121,7 @@ 0000,CYBER.STRIKE=Cyber Strike 0001,CYCLOD=Cyclod 0115,DG=D-Generation -0001,DANGEROUS.DAVE=Dangerous Dave +0115,DANGEROUS.DAVE=Dangerous Dave 0115,DD.RETURNS=Dangerous Dave Returns 0001,DU=Darkstar Unhinged 1000,DM=David's Midnight Magic diff --git a/res/TITLE.DHGR/DANGEROUS.DAVE b/res/TITLE.DHGR/DANGEROUS.DAVE new file mode 100644 index 000000000..773d0b225 Binary files /dev/null and b/res/TITLE.DHGR/DANGEROUS.DAVE differ diff --git a/res/dsk/dangerous dave DHGR 6502 (san inc pack).po b/res/dsk/dangerous dave DHGR 6502 (san inc pack).po new file mode 100644 index 000000000..1b1228905 Binary files /dev/null and b/res/dsk/dangerous dave DHGR 6502 (san inc pack).po differ diff --git a/res/dsk/dangerous dave.po b/res/dsk/dangerous dave.po deleted file mode 100644 index 5a49ac3a3..000000000 Binary files a/res/dsk/dangerous dave.po and /dev/null differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 044be5e04..f2c3ca45f 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 11227392 + !be24 11243717 !le16 4505 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index a5c25b489..318eb4670 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 11179819 + !be24 11196123 !le16 5251 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index dd62a6a32..267436e28 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 11122276 + !be24 11138620 !le16 3593 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 582c8bce1..c151319f0 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 11134723 + !be24 11151067 !le16 3970 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 91d3cb721..cc88b1d85 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 11150212 + !be24 11166516 !le16 5026 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index c801bdb01..df4051e0b 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 11168002 + !be24 11184306 !le16 5616 diff --git a/src/index/count00.a b/src/index/count00.a index c9240220a..0426336c8 100644 --- a/src/index/count00.a +++ b/src/index/count00.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 266 +!word 265 diff --git a/src/index/count10.a b/src/index/count10.a index e072d0784..f014c875d 100644 --- a/src/index/count10.a +++ b/src/index/count10.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 375 +!word 374 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index a377e14c1..f1ccbd999 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 11231897 + !be24 11248222 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 6bc967ec4..1e49f35c1 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 11232651 + !be24 11248976 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 9c7f893f9..04a75ba42 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 11233099 + !be24 11249424 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index e49002b1c..47c0182b5 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 11187216 + !be24 11203520 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index dfe1e07da..cd6d16745 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 11232383 + !be24 11248708 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index b635c10f4..319f6c501 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 11227333 + !be24 11243658 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 577466345..2a70a5f69 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 11225968 + !be24 11242293 !le16 1284 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 5197c225e..cbb6339ea 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 11211912 - !le16 481 + !be24 11228216 + !le16 502 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index ba563075f..daf05da05 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 11185070 + !be24 11201374 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 621eda8ec..2647feaa8 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 11188816 + !be24 11205120 !le16 6201 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 535fb159c..1958ccb6b 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 11232307 + !be24 11248632 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index f3503cf83..c3b9dada9 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 11227252 + !be24 11243577 !le16 81 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 30929e8d7..eaac56cee 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 11232450 + !be24 11248775 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 244403766..a58fd1ab7 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 11212393 + !be24 11228718 !le16 4407 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index c6ce41dac..9cef79151 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 11216800 + !be24 11233125 !le16 1562 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 5789cad05..6d1064e83 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 11218362 + !be24 11234687 !le16 1040 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 81209e7a9..37a6d1d76 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 11219402 + !be24 11235727 !le16 3237 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 178e80913..9b02189d7 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 11222639 + !be24 11238964 !le16 2764 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index e1ff8abdb..ba328938e 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 11225403 + !be24 11241728 !le16 460 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 4f3ea14ed..9562fcbec 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 11225863 + !be24 11242188 !le16 105 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 75914a8c8..166a560b8 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 11233402 + !be24 11249727 !le16 2370 diff --git a/src/index/miniattract.idx.a b/src/index/miniattract.idx.a index 5dfc4afa9..49e6cd93b 100644 --- a/src/index/miniattract.idx.a +++ b/src/index/miniattract.idx.a @@ -4,5 +4,5 @@ ; This file is automatically generated ; !byte 0 - !be24 11199930 + !be24 11216234 !le16 6201 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 3e1e3adc7..8ab9a0b58 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 11173618 + !be24 11189922 !le16 6201 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index 7358d5421..6deb17953 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 3563008 + !be24 3579392 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 0c4cc03bc..fe08f7c7d 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 3579392 + !be24 3595776 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index d7bd2f6af..9d8369e1c 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 3571200 + !be24 3587584 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 074f2238f..9f0e0963e 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 11114218 - !le16 8058 + !be24 11130602 + !le16 8018 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 73e134adc..b45521157 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 11125869 + !be24 11142213 !le16 8854 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 15765e3f0..6de201e90 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 11138693 - !le16 11519 + !be24 11155037 + !le16 11479 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 74a96d6ed..0a589d33d 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 11155238 + !be24 11171542 !le16 12764 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index a5ca8c242..9e3a94937 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 11188458 + !be24 11204762 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index d35183301..0a9ddea7b 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 11195017 + !be24 11211321 !le16 4913 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index c24a7175f..1a5b36d24 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 11206131 + !be24 11222435 !le16 5781 diff --git a/src/prelaunch/dangerous.dave.a b/src/prelaunch/dangerous.dave.a index 26ff6e338..12ee8a1bd 100644 --- a/src/prelaunch/dangerous.dave.a +++ b/src/prelaunch/dangerous.dave.a @@ -1,57 +1,36 @@ ;license:MIT -;(c) 2020 by Tom Greene +;(c) 2022 by qkumba !cpu 6502 !to "build/PRELAUNCH.INDEXED/DANGEROUS.DAVE",plain *=$106 - !source "src/prelaunch/common.a" + !source "src/prelaunch/common.a" +ENABLE_ACCEL - lda #$60 ; patch loader to return - sta $20C6 - ; auto-patch lowercase on II+ -+ lda ROM_MACHINEID - cmp #$06 - beq + - lda #casefix - sta $2391 - -+ jsr $2000 - - +GET_MACHINE_STATUS - and #CHEATS_ENABLED - beq + - ldx #$2C - stx $8A61 ; don't decrement lives - -+ - ; the game calls the Applesoft RND function in ROM - ; so we need to copy the seed into ZP, otherwise it - ; will get stuck in an infinite loop - ldx #$04 -- lda seed,x - sta $C9,x - dex + lda #$60 + sta $2035 + sta $20A1 + ldy #(x_e - x_b) - 1 +- lda x_b, y + sta $200, y + dey bpl - + jmp $200 +x_b !pseudopc $200 { + jsr $2000 ; ProDOS init + tay + sta $c009 + jsr $2036 ; decompress + sta $c008 + +RESET_VECTOR $870 +DISABLE_ACCEL - jmp $20EC - -casefix - cmp #$E1 - bcc + - and #$DF -+ jsr ROM_COUT - rts - - -seed - !byte $80, $4F, $C7, $52, $FF - + sta $c009 + jmp $800 +} +x_e !if * > $1C0 { !error "code is too large, ends at ", *