diff --git a/res/CACHE00.IDX b/res/CACHE00.IDX index 97f54e653..10675d8ba 100644 Binary files a/res/CACHE00.IDX and b/res/CACHE00.IDX differ diff --git a/res/CACHE01.IDX b/res/CACHE01.IDX index 49300a19a..67459a475 100644 Binary files a/res/CACHE01.IDX and b/res/CACHE01.IDX differ diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index e6b34d3b5..415fcd0c9 100644 Binary files a/res/CACHE10.IDX and b/res/CACHE10.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index 2620f668c..562dd5ded 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 43b0ea8ac..507805f25 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -206,6 +206,7 @@ 1001,HARDHAT=Hardhat 0001,HEAD.ON=Head On 1111,HEAVY.BARREL=Heavy Barrel +0001,HELLSTORM=Hell Storm 0000,HIGH.RISE=High Rise 0001,HORIZON.V=Horizon V 0001,HUNGRYBOY=Hungryboy @@ -224,6 +225,8 @@ 0001,JAWBREAKER.II=Jawbreaker II 0006,JELLYFISH=Jellyfish 0001,JOUST=Joust +1001,JOUSTER=Jouster +1001,JOVIAN.ATTACK=Jovian Attack 0001,JUGGLER=Juggler 0001,JUMP.JET=Jump Jet 0001,JUMPMAN=Jumpman @@ -283,6 +286,7 @@ 0007,NT=Neut Tower 1000,NEUTRONS=Neutrons 0004,NIBBLER=Nibbler +0000,NIGHT.CRAWLER=Night Crawler 0007,NM=Night Mission Pinball 0001,NIGHT.STALKER=Night Stalker 0001,NI=Nightmare Gallery diff --git a/res/TITLE.HGR.UNPACKED/HELLSTORM b/res/TITLE.HGR.UNPACKED/HELLSTORM new file mode 100644 index 000000000..2ecda3a86 Binary files /dev/null and b/res/TITLE.HGR.UNPACKED/HELLSTORM differ diff --git a/res/TITLE.HGR.UNPACKED/JOUSTER b/res/TITLE.HGR.UNPACKED/JOUSTER new file mode 100644 index 000000000..270f2abef Binary files /dev/null and b/res/TITLE.HGR.UNPACKED/JOUSTER differ diff --git a/res/TITLE.HGR.UNPACKED/JOVIAN.ATTACK b/res/TITLE.HGR.UNPACKED/JOVIAN.ATTACK new file mode 100644 index 000000000..2b677aaf3 Binary files /dev/null and b/res/TITLE.HGR.UNPACKED/JOVIAN.ATTACK differ diff --git a/res/TITLE.HGR.UNPACKED/NIGHT.CRAWLER b/res/TITLE.HGR.UNPACKED/NIGHT.CRAWLER new file mode 100644 index 000000000..8034a8363 Binary files /dev/null and b/res/TITLE.HGR.UNPACKED/NIGHT.CRAWLER differ diff --git a/res/TITLE.HGR/HELLSTORM b/res/TITLE.HGR/HELLSTORM new file mode 100644 index 000000000..3c7ffda0f Binary files /dev/null and b/res/TITLE.HGR/HELLSTORM differ diff --git a/res/TITLE.HGR/JOUSTER b/res/TITLE.HGR/JOUSTER new file mode 100644 index 000000000..569614228 Binary files /dev/null and b/res/TITLE.HGR/JOUSTER differ diff --git a/res/TITLE.HGR/JOVIAN.ATTACK b/res/TITLE.HGR/JOVIAN.ATTACK new file mode 100644 index 000000000..b5b70bd12 Binary files /dev/null and b/res/TITLE.HGR/JOVIAN.ATTACK differ diff --git a/res/TITLE.HGR/NIGHT.CRAWLER b/res/TITLE.HGR/NIGHT.CRAWLER new file mode 100644 index 000000000..192aaf88b Binary files /dev/null and b/res/TITLE.HGR/NIGHT.CRAWLER differ diff --git a/res/dsk/hellstorm 11k file PRODOS (san inc pack).po b/res/dsk/hellstorm 11k file PRODOS (san inc pack).po new file mode 100644 index 000000000..14f8cd0aa Binary files /dev/null and b/res/dsk/hellstorm 11k file PRODOS (san inc pack).po differ diff --git a/res/dsk/jouster 7k file PRODOS (san inc pack).po b/res/dsk/jouster 7k file PRODOS (san inc pack).po new file mode 100644 index 000000000..eb2307826 Binary files /dev/null and b/res/dsk/jouster 7k file PRODOS (san inc pack).po differ diff --git a/res/dsk/jovian attack 5k file PRODOS (san inc pack).po b/res/dsk/jovian attack 5k file PRODOS (san inc pack).po new file mode 100644 index 000000000..d391939b8 Binary files /dev/null and b/res/dsk/jovian attack 5k file PRODOS (san inc pack).po differ diff --git a/res/dsk/night crawler 6k file PRODOS (san inc pack).po b/res/dsk/night crawler 6k file PRODOS (san inc pack).po new file mode 100644 index 000000000..47f46a7e3 Binary files /dev/null and b/res/dsk/night crawler 6k file PRODOS (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 8931b15f4..6bb6cc27d 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 12020105 + !be24 12049951 !le16 5108 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index faa616d91..00f700fe3 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 11969026 - !le16 5469 + !be24 11998839 + !le16 5441 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 8066e165f..5c35a529b 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 11907315 - !le16 3786 + !be24 11936549 + !le16 3824 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 87bcf3d61..efad4528b 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 11920672 - !le16 4209 + !be24 11950013 + !le16 4247 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 615668a3a..823ace953 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 11937303 - !le16 5329 + !be24 11966815 + !le16 5378 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index a92811f2b..33e1dbf00 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 11956377 - !le16 5960 + !be24 11986071 + !le16 6009 diff --git a/src/index/count00.a b/src/index/count00.a index 00b2cbd78..7a18e0b91 100644 --- a/src/index/count00.a +++ b/src/index/count00.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 286 +!word 288 diff --git a/src/index/count01.a b/src/index/count01.a index 717eeeda3..8559977fa 100644 --- a/src/index/count01.a +++ b/src/index/count01.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 313 +!word 315 diff --git a/src/index/count10.a b/src/index/count10.a index 1d00484a1..62bb25fdd 100644 --- a/src/index/count10.a +++ b/src/index/count10.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 403 +!word 407 diff --git a/src/index/count11.a b/src/index/count11.a index 9eec0aa8a..ee4ee88d8 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 445 +!word 449 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index f86fa2f1f..6774ac596 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 12025213 + !be24 12055059 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 84610c11c..37094ba08 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 12025967 + !be24 12055813 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 66468e444..552fc84e9 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 12026415 + !be24 12056261 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 3329ac118..d3735cfcb 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 11977135 - !le16 1719 + !be24 12006920 + !le16 1640 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 8084cc0bb..82f70ccf3 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 12025699 + !be24 12055545 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index c030082a5..20e0a33bc 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 12020046 + !be24 12049892 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index ef367ee40..942c06c9a 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 12018512 + !be24 12048358 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index ac4146cb5..af686e550 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 12003900 + !be24 12033746 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 6ae80a28e..b7590a85c 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 11974495 + !be24 12004280 !le16 2640 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index f753d5d87..f0d46647b 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 11979212 - !le16 6689 + !be24 12008918 + !le16 6759 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 4a70b27cd..9ca853c7f 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 12025623 + !be24 12055469 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 5d6dcdcce..cd5cbfeff 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 12019949 + !be24 12049795 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index e5a3bd383..0ada6d228 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 12025766 + !be24 12055612 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 8adb64ba0..df8826d4c 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 12004437 + !be24 12034283 !le16 4516 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index fe35ca4e6..3ccb676df 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 12008953 + !be24 12038799 !le16 1669 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 910283450..6774b3c9d 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 12010622 + !be24 12040468 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 1b7b7d8f5..e45378619 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 12011675 + !be24 12041521 !le16 3259 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 8cd0497fa..34bbc65bf 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 12014934 + !be24 12044780 !le16 2985 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 33a477489..acd9b6c06 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 12017919 + !be24 12047765 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 6014fc741..b00653338 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 12018398 + !be24 12048244 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 7f7cba9f4..147ec45b3 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 12026718 + !be24 12056564 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 202dafabc..961dd4cbb 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 11990973 + !be24 12020749 !le16 4457 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 338ca696a..9f2bb4a78 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 11995430 + !be24 12025206 !le16 2236 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 9fcdbdb50..f380041bd 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 11962337 - !le16 6689 + !be24 11992080 + !le16 6759 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index ab20ab339..36b89d964 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 3837440 + !be24 3868672 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 9cd7aafe2..58122221a 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 3853824 + !be24 3885056 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 5703db94b..b8baf8ad2 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 3845632 + !be24 3876864 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 98190a13c..819cf86d7 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 11898618 - !le16 8697 + !be24 11927783 + !le16 8766 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index be2f0a63f..071cb30f3 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 11911101 - !le16 9571 + !be24 11940373 + !le16 9640 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 73efa620a..5a508ebf3 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 11924881 - !le16 12422 + !be24 11954260 + !le16 12555 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 471850a1b..091c8f8a8 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 11942632 - !le16 13745 + !be24 11972193 + !le16 13878 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index dbd714d1c..7f7840ad6 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 11978854 + !be24 12008560 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 715e33cdc..9583ce58b 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 11985901 + !be24 12015677 !le16 5072 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index d4b727c91..ed61f07c4 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 11997666 - !le16 6234 + !be24 12027442 + !le16 6304 diff --git a/src/prelaunch/hellstorm.a b/src/prelaunch/hellstorm.a new file mode 100644 index 000000000..d9e2c3602 --- /dev/null +++ b/src/prelaunch/hellstorm.a @@ -0,0 +1,28 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/HELLSTORM",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + lda #$60 + sta $202C + jsr $2000 ; decompress + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #$ad + sta $84CE ; patch - don't decrease lives + sta $8527 ; patch - don't increase lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE + jmp $12A6 + +!if * > $1C0 { + !error "code is too large, ends at ", * +} diff --git a/src/prelaunch/jouster.a b/src/prelaunch/jouster.a new file mode 100644 index 000000000..dd87d71cf --- /dev/null +++ b/src/prelaunch/jouster.a @@ -0,0 +1,28 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/JOUSTER",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + lda #$60 + sta $94AF + jsr $7800 ; decompress + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #$ad + sta $955 ; patch - don't decrease lives + sta $F28 ; patch - don't increase lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE + jmp $800 + +!if * > $1C0 { + !error "code is too large, ends at ", * +} diff --git a/src/prelaunch/jovian.attack.a b/src/prelaunch/jovian.attack.a new file mode 100644 index 000000000..e11e8b16a --- /dev/null +++ b/src/prelaunch/jovian.attack.a @@ -0,0 +1,31 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/JOVIAN.ATTACK",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + lda #callback + sta $404E + jmp $4000 ; decompress + +callback + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #$a5 + sta $11D2 ; patch - don't decrease lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE + jmp $46E + +!if * > $1C0 { + !error "code is too large, ends at ", * +} diff --git a/src/prelaunch/night.crawler.a b/src/prelaunch/night.crawler.a new file mode 100644 index 000000000..5e618f7e7 --- /dev/null +++ b/src/prelaunch/night.crawler.a @@ -0,0 +1,19 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/NIGHT.CRAWLER",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + lda #$60 + sta $201C + jsr $2000 ; decompress + +DISABLE_ACCEL + jmp $900 + +!if * > $1C0 { + !error "code is too large, ends at ", * +}