diff --git a/res/ACTION.HGR.UNCOMPRESSED/TOMAHAWK b/res/ACTION.HGR.UNCOMPRESSED/TOMAHAWK deleted file mode 100644 index 58f48f410..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/TOMAHAWK and /dev/null differ diff --git a/res/ACTION.HGR/TOMAHAWK b/res/ACTION.HGR/TOMAHAWK deleted file mode 100644 index 7f085839d..000000000 Binary files a/res/ACTION.HGR/TOMAHAWK and /dev/null differ diff --git a/res/ARTWORK.SHR.SCORES/TOMAHAWK b/res/ARTWORK.SHR.SCORES/TOMAHAWK deleted file mode 100644 index 9cab7aa95..000000000 --- a/res/ARTWORK.SHR.SCORES/TOMAHAWK +++ /dev/null @@ -1 +0,0 @@ - 438.3489808779948 diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/TOMAHAWK b/res/ARTWORK.SHR.UNCOMPRESSED/TOMAHAWK deleted file mode 100644 index 4438478d8..000000000 Binary files a/res/ARTWORK.SHR.UNCOMPRESSED/TOMAHAWK and /dev/null differ diff --git a/res/ARTWORK.SHR/TOMAHAWK b/res/ARTWORK.SHR/TOMAHAWK deleted file mode 100644 index daf64e1b9..000000000 Binary files a/res/ARTWORK.SHR/TOMAHAWK and /dev/null differ diff --git a/res/ATTRACT/TOMAHAWK b/res/ATTRACT/TOMAHAWK deleted file mode 100644 index eb080297a..000000000 --- a/res/ATTRACT/TOMAHAWK +++ /dev/null @@ -1,9 +0,0 @@ -# -# Attract mode for TOMAHAWK -# This file is automatically generated -# - -TOMAHAWK=C -TOMAHAWK=A - -[eof] diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index a49e4f909..3a74c9b19 100644 Binary files a/res/CACHE10.IDX and b/res/CACHE10.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index 23c6e2496..7e9242b67 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/GAMEHELP/TOMAHAWK b/res/GAMEHELP/TOMAHAWK deleted file mode 100644 index cf9435382..000000000 --- a/res/GAMEHELP/TOMAHAWK +++ /dev/null @@ -1,24 +0,0 @@ - Destroy the enemy targets - - - joystick to steer * button to fire - - -W / S* * * * * * * * * * * * * *throttle - -Q / A* * * * * * * * * * * * * * * *lift - -Z / X* * * * * * * * * * * * * * * * yaw - -C* * * * * * * * * * * * * *doppler mode - - B beacon H landing pad - - T ground attack A air to air - -P* * * * * * * *gun / rockets / missiles - -M* * * * * * * * * * * * * * * * * * map - -N* * * * * * * * * * * * *next objective -[eof] diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 48f4a5c55..0500460f2 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -427,7 +427,6 @@ 0001,THUNDER.BOMBS=Thunder Bombs 1001,TIME.PILOT=Time Pilot 0001,TITAN.CRONUS=Titan Cronus -1000,TOMAHAWK=Tomahawk 0001,TORAX=Torax 1000,TORPEDO.TERROR=Torpedo Terror 0004,TRACK.ATTACK=Track Attack diff --git a/res/SS/ACTIONT4.CONF b/res/SS/ACTIONT4.CONF index 35be56bda..91d5a9214 100644 --- a/res/SS/ACTIONT4.CONF +++ b/res/SS/ACTIONT4.CONF @@ -10,7 +10,6 @@ THIEF VIPER.PATROL THE.SNAPPER VINDICATOR -TOMAHAWK TAPPER WAYOUT2=WAYOUT diff --git a/res/SS/DATASOFT.CONF b/res/SS/DATASOFT.CONF index 6070c5dec..87d0363c9 100644 --- a/res/SS/DATASOFT.CONF +++ b/res/SS/DATASOFT.CONF @@ -4,7 +4,6 @@ MD DUNG.BEETLES -TOMAHAWK CANYON.CLIMBER ZAXXON BLACK.MAGIC diff --git a/res/SS/FAVORITES1.CONF b/res/SS/FAVORITES1.CONF index 9a1f509e5..907d838fd 100644 --- a/res/SS/FAVORITES1.CONF +++ b/res/SS/FAVORITES1.CONF @@ -2,7 +2,6 @@ # slideshow of favorite title screens # -TOMAHAWK WAVY.NAVY SD DIG.DUG diff --git a/res/SS/SHR38.CONF b/res/SS/SHR38.CONF index c6f7ae697..883c3c0ef 100644 --- a/res/SS/SHR38.CONF +++ b/res/SS/SHR38.CONF @@ -3,10 +3,10 @@ # DUNG.BEETLES -TOMAHAWK ZOO.MASTER DG JAWBREAKER.II RADWARRIOR +ALF [eof] diff --git a/res/SS/SHR54.CONF b/res/SS/SHR54.CONF index 40ae0f19a..371c57b84 100644 --- a/res/SS/SHR54.CONF +++ b/res/SS/SHR54.CONF @@ -8,6 +8,5 @@ SPACE.KADET JUGGLER VV DRAGONFIRE -ALF [eof] diff --git a/res/SS/T1.CONF b/res/SS/T1.CONF index 0a400eddc..495a2edbf 100644 --- a/res/SS/T1.CONF +++ b/res/SS/T1.CONF @@ -2,7 +2,6 @@ # slideshow of games that begin with "T","U","V","W","X","Y","Z" # -TOMAHAWK THE.SPACE.ARK THUNDER.BOMBS VINDICATOR diff --git a/res/TITLE.HGR.UNPACKED/TOMAHAWK b/res/TITLE.HGR.UNPACKED/TOMAHAWK deleted file mode 100644 index 9eb619197..000000000 Binary files a/res/TITLE.HGR.UNPACKED/TOMAHAWK and /dev/null differ diff --git a/res/TITLE.HGR/TOMAHAWK b/res/TITLE.HGR/TOMAHAWK deleted file mode 100644 index b0c4cf6fd..000000000 Binary files a/res/TITLE.HGR/TOMAHAWK and /dev/null differ diff --git a/res/dsk/tomahawk 33k file PRODOS (san inc pack).po b/res/dsk/tomahawk 33k file PRODOS (san inc pack).po deleted file mode 100644 index e9d1395c8..000000000 Binary files a/res/dsk/tomahawk 33k file PRODOS (san inc pack).po and /dev/null differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 60f85523d..f43882bc6 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 12057382 - !le16 5198 + !be24 12027114 + !le16 5183 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 24b8c5663..153cd77f8 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 12007793 + !be24 11977585 !le16 5362 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 27cba960b..e35cf041f 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 11946718 + !be24 11916595 !le16 3752 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index f447af016..020fd11f7 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 11959880 + !be24 11929757 !le16 4172 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index c10122cc5..694ce178f 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 11976305 - !le16 5339 + !be24 11946154 + !le16 5332 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 160e37441..cb91701c0 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 11995220 - !le16 5974 + !be24 11965034 + !le16 5967 diff --git a/src/index/count10.a b/src/index/count10.a index ab3376018..d36616f69 100644 --- a/src/index/count10.a +++ b/src/index/count10.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 397 +!word 396 diff --git a/src/index/count11.a b/src/index/count11.a index ec2064964..c69fde769 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 439 +!word 438 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 015022152..1b98ec72d 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 12062580 + !be24 12032297 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 3446ad6af..8862585dc 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 12063334 + !be24 12033051 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index d6cd20fc9..ff72ca671 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 12063782 + !be24 12033499 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 116166250..938445b02 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 12015301 + !be24 11985093 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 0c1ec73e7..cd8607413 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 12063066 + !be24 12032783 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 34913592a..7ef858cda 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 12057323 + !be24 12027055 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 9389967ff..28e8cac15 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 12055789 + !be24 12025521 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index efead590c..aa0f02527 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 12041225 + !be24 12010972 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 044dc92c6..e8f113552 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 12013155 + !be24 11982947 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index f2f90952a..1afe2f91f 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 12016901 - !le16 6599 + !be24 11986693 + !le16 6584 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index fa269ce99..226e96a34 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 12062990 + !be24 12032707 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 14ca33e0a..a5cf7ed4a 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 12057226 + !be24 12026958 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index a0a20ea8d..d58e11032 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 12063133 + !be24 12032850 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 295520c08..a83c81891 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 12041762 + !be24 12011509 !le16 4549 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 1138bc31c..7345ddb7f 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 12046311 + !be24 12016058 !le16 1658 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 045ea7c3f..9f54db12f 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 12047969 + !be24 12017716 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 48d9253da..e52abedaf 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 12049022 + !be24 12018769 !le16 3267 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 8919db337..1be8b0b61 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 12052289 - !le16 2907 + !be24 12022036 + !le16 2892 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index ea69ee4fd..27f1a4719 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 12055196 + !be24 12024928 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 3e90d2ea0..837e736a5 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 12055675 + !be24 12025407 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index efa530f8f..b16dbba21 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 12064085 + !be24 12033802 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 06b3388c5..ed6c5ecd7 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 12028478 + !be24 11998255 !le16 4388 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index bccd69141..4353ee3ca 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 12032866 - !le16 2215 + !be24 12002643 + !le16 2200 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index f128c666a..6bcc4f49c 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 12001194 - !le16 6599 + !be24 11971001 + !le16 6584 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index af6c11168..b97dd1af7 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 3790848 + !be24 3782656 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 00aacbaaa..1be0e658c 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 3807232 + !be24 3799040 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 6101a0c6a..748a81cf3 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 3799040 + !be24 3790848 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 988057c25..fdc949501 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 11938182 + !be24 11908059 !le16 8536 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index e2a435d4c..1a044b569 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 11950470 + !be24 11920347 !le16 9410 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 879f0f69e..17ff9a4b7 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 11964052 - !le16 12253 + !be24 11933929 + !le16 12225 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 6d576d67f..28f878db4 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 11981644 - !le16 13576 + !be24 11951486 + !le16 13548 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 22bce22f5..b6505c0f6 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 12016543 + !be24 11986335 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index d87069513..4f6f8ce51 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 12023500 + !be24 11993277 !le16 4978 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index d1dc7aff2..7ea63a987 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 12035081 - !le16 6144 + !be24 12004843 + !le16 6129 diff --git a/src/prelaunch/tomahawk.a b/src/prelaunch/tomahawk.a deleted file mode 100755 index 6d914a228..000000000 --- a/src/prelaunch/tomahawk.a +++ /dev/null @@ -1,42 +0,0 @@ -;license:MIT -;(c) 2019 by qkumba/Frank M. - -!cpu 6502 -!to "build/PRELAUNCH.INDEXED/TOMAHAWK",plain -*=$106 - - !source "src/prelaunch/common.a" - - +ENABLE_ACCEL - +READ_RAM2_WRITE_RAM2 - lda #reset - sta $FFFD ; reset vector fix for title - +READ_ROM_NO_WRITE - - lda #$60 - sta $309B - jsr $3019 - - +RESET_VECTOR reset - +READ_RAM2_WRITE_RAM2 - lda #reset - sta $9768 ; gets patched to LC later - sta $FFFD ; also, our LC fix wrecked later in title - +READ_ROM_NO_WRITE - ; yes, it changes the vector like 300 times - +DISABLE_ACCEL - lda $C083 - jmp $235 - -reset - +READ_ROM_NO_WRITE - jmp $FAA6 - -!if * > $1C0 { - !error "code is too large, ends at ", * -}