diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 2ee9ec72d..61bf5f4b9 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -409,12 +409,12 @@ 0000,THE.SPACE.ARK=The Space Ark 0001,S2=The Spy Strikes Back 1000,VV=The Voyage of the Valkyrie -0010,THEXDER=Thexder +0015,THEXDER=Thexder 0000,THIEF=Thief 0001,THRESHOLD=Threshold -0000,THUNDER.BOMBS=Thunder Bombs +0001,THUNDER.BOMBS=Thunder Bombs 1000,TIME.PILOT=Time Pilot -0000,TITAN.CRONUS=Titan Cronus +0001,TITAN.CRONUS=Titan Cronus 1000,TOMAHAWK=Tomahawk 0000,TORAX=Torax 1000,TORPEDO.TERROR=Torpedo Terror @@ -443,7 +443,7 @@ 0000,WILLY.BYTE=Willy Byte 1113,WF=Wings of Fury 1001,XEVIOUS=Xevious -0000,ZARGS=Zargs +0001,ZARGS=Zargs 1001,ZAXXON=Zaxxon 0000,ZENITH=Zenith 1000,ZP=Zero Gravity Pinball diff --git a/res/dsk/thunder bombs 14k file PRODOS (san inc pack).po b/res/dsk/thunder bombs 14k file PRODOS (san inc pack).po index b2ee10648..0e9808c47 100644 Binary files a/res/dsk/thunder bombs 14k file PRODOS (san inc pack).po and b/res/dsk/thunder bombs 14k file PRODOS (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 56cf8d977..3fe488c79 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 11394932 + !be24 11395444 !le16 4515 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index b8282080d..178e5a1db 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 11346483 + !be24 11346995 !le16 5275 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index bd938db26..58ed2acae 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 11286963 + !be24 11287475 !le16 3651 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 0a4ab081b..52600df7a 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 11299711 + !be24 11300223 !le16 4061 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index b5b696b38..cc1825b19 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 11315718 + !be24 11316230 !le16 5242 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 42e8c8a51..5cb32323f 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 11334199 + !be24 11334711 !le16 5867 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 73cfb1019..2ef92dbc5 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 11399447 + !be24 11399959 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 6f7471ce6..77778b7e1 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 11400201 + !be24 11400713 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 567fdc513..cd95317a0 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 11400649 + !be24 11401161 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 1e8112e98..3f7ac0934 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 11353904 + !be24 11354416 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 86d627255..e130882dd 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 11399933 + !be24 11400445 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index b2c62f8e8..7410c3906 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 11394873 + !be24 11395385 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index b300df94e..b1689068b 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 11393508 + !be24 11394020 !le16 1284 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 3225285aa..a8bf88691 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 11379250 + !be24 11379762 !le16 521 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 3f5fd208b..15c462ca2 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 11351758 + !be24 11352270 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index b778352de..eae7a1f76 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 11355504 + !be24 11356016 !le16 6417 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 1b24ad845..4571e3c88 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 11399857 + !be24 11400369 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 0f8751a37..99ad9ee4e 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 11394792 + !be24 11395304 !le16 81 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 4bb40e00a..6cfe489b3 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 11400000 + !be24 11400512 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index aa63da9a9..5100397d1 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 11379771 + !be24 11380283 !le16 4511 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 06208b280..9b74ad8d4 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 11384282 + !be24 11384794 !le16 1575 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index c55a6ce24..7751114da 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 11385857 + !be24 11386369 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 5749bdcd1..eaa8f3d89 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 11386910 + !be24 11387422 !le16 3237 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 8d8747fef..34e6b3512 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 11390147 + !be24 11390659 !le16 2796 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index b414c35ac..0a9041ef3 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 11392943 + !be24 11393455 !le16 460 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index ee05fc31b..ec90f5ea8 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 11393403 + !be24 11393915 !le16 105 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index a19cca561..30320abc4 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 11400952 + !be24 11401464 !le16 2370 diff --git a/src/index/miniattract.idx.a b/src/index/miniattract.idx.a index e938cb4e3..517867174 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 11366855 + !be24 11367367 !le16 6417 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 34377a628..aab93d7f3 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 11340066 + !be24 11340578 !le16 6417 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index 298ae8acb..e7c259738 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 3689472 + !be24 3689984 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 5afe8934f..697dcd9c8 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 3705856 + !be24 3706368 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 215742ea3..ae2a72175 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 3697664 + !be24 3698176 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 594ee5f56..e5824aa45 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 11278710 + !be24 11279222 !le16 8253 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index a16f6b36f..a0ebc7856 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 11290614 + !be24 11291126 !le16 9097 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index ad57e38ae..f7063f19b 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 11303772 + !be24 11304284 !le16 11946 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 6177c4e8c..da372776b 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 11320960 + !be24 11321472 !le16 13239 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 1359d0be1..589eaaddf 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 11355146 + !be24 11355658 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 10e41f430..e34edf09e 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 11361921 + !be24 11362433 !le16 4934 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 08fd116b2..4f90ed74b 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 11373272 + !be24 11373784 !le16 5978 diff --git a/src/prelaunch/thexder.a b/src/prelaunch/thexder.a index a5812a831..57364b979 100755 --- a/src/prelaunch/thexder.a +++ b/src/prelaunch/thexder.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2019-2020 by qkumba/Frank M. +;(c) 2019-2020, 2022 by qkumba/Frank M. !cpu 6502 !to "build/PRELAUNCH.INDEXED/THEXDER",plain @@ -7,7 +7,12 @@ !source "src/prelaunch/common.a" - +ENABLE_ACCEL + +READ_RAM2_NO_WRITE + jsr EnableAccelerator + lda MachineStatus + +READ_ROM_NO_WRITE + and #CHEATS_ENABLED + php lda #$60 sta $83F jsr $800 @@ -22,16 +27,29 @@ sta $47FC lda #>reset sta $47FD ; moved to LC $FFFC/D - +DISABLE_ACCEL - jmp $1800 + plp + beq ++ + dec $37ED ; don't decrease energy + dec $3FB4 ; don't decrease energy + dec $401A ; don't decrease energy + beq ++ ; always reset +READ_ROM_NO_WRITE jmp $FAA6 + inc $3F4 ; force reboot + lda #$60 + sta $13B3 + jsr $1200 + plp + beq ++ + dec $38D2 ; don't decrease energy + dec $40A6 ; don't decrease energy + dec $410C ; don't decrease energy +++ +DISABLE_ACCEL - jmp $1200 + jmp $1800 !if * > $1C0 { !error "code is too large, ends at ", * diff --git a/src/prelaunch/thunder.bombs.a b/src/prelaunch/thunder.bombs.a index 7ee3c5170..13ccdaf79 100644 --- a/src/prelaunch/thunder.bombs.a +++ b/src/prelaunch/thunder.bombs.a @@ -11,7 +11,7 @@ sta $887F lda #fakewait sta $8823+2 sta $882B+2 ; fix timing of title screen on //gs @@ -27,7 +27,6 @@ +READ_RAM2_NO_WRITE lda MockingboardStuff - +READ_ROM_NO_WRITE beq ++ tax and #7 @@ -45,7 +44,14 @@ sty $340 jsr $7CB4 ++ - +DISABLE_ACCEL + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #$AD + sta $E39 ; don't decrease lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE lda $323 jmp $781B diff --git a/src/prelaunch/titan.cronus.a b/src/prelaunch/titan.cronus.a index b203df1f1..16135fb23 100644 --- a/src/prelaunch/titan.cronus.a +++ b/src/prelaunch/titan.cronus.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/TITAN.CRONUS",plain @@ -25,9 +25,29 @@ hook +NEW_RESET_VECTOR $280 lda #$30 sta $C84+3 ; (replaces TEXT:HOME:END) - +DISABLE_ACCEL + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #callback + sta $1074 ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE jmp $D566 +callback + pla + pla + jsr $1080 + jsr $1075 + lda #$AD + sta $808C ; don't increase lives + sta $8595 ; don't decrease lives + rts + !if * > $1C0 { !error "code is too large, ends at ", * } diff --git a/src/prelaunch/zargs.a b/src/prelaunch/zargs.a index edb318de6..fd8f2bf69 100644 --- a/src/prelaunch/zargs.a +++ b/src/prelaunch/zargs.a @@ -1,5 +1,5 @@ ;license:MIT -;(c) 2020 by qkumba/Frank M. +;(c) 2020, 2022 by qkumba/Frank M. !cpu 6502 !to "build/PRELAUNCH.INDEXED/ZARGS",plain @@ -17,7 +17,14 @@ callback lda #1 sta $60B0 ; reset vector fix - +DISABLE_ACCEL + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + dec $9FA7 ; don't decrease lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE jmp $6000 !if * > $1C0 {