diff --git a/res/CACHE01.IDX b/res/CACHE01.IDX index 4cc8705d1..6a672f2e0 100644 Binary files a/res/CACHE01.IDX and b/res/CACHE01.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index 9f1f56eef..cdbbef0a4 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/GAMES.CONF b/res/GAMES.CONF index 960d42e21..8862fa0e0 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -98,6 +98,7 @@ 0001,CAPTAIN.POWER=Captain Power 0002,CS=Castle Smurfenstein 0002,CW=Castle Wolfenstein +0117,CATACOMBS=Catacombs 0001,CAVRN.CREATURES=Cavern Creatures 1001,CC=Caverns of Callisto 1001,CEILING.ZERO=Ceiling Zero diff --git a/res/TITLE.DHGR/CATACOMBS b/res/TITLE.DHGR/CATACOMBS new file mode 100644 index 000000000..ce001e561 Binary files /dev/null and b/res/TITLE.DHGR/CATACOMBS differ diff --git a/res/dsk/catacombs 6502 (san inc pack).po b/res/dsk/catacombs 6502 (san inc pack).po new file mode 100644 index 000000000..f21789034 Binary files /dev/null and b/res/dsk/catacombs 6502 (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 3cdd04233..5e56ab63a 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 11466682 + !be24 11483194 !le16 4580 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 7a026e777..3d9c1104e 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 11417846 + !be24 11434326 !le16 5343 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 27528fee9..d02d1dc13 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 11358208 + !be24 11374592 !le16 3654 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index dd09f49b3..5cb438cd6 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 11370989 - !le16 4064 + !be24 11387403 + !le16 4074 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index b89166428..fc653979c 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 11387029 + !be24 11403453 !le16 5245 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 68246042e..cbb621e50 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 11405543 - !le16 5870 + !be24 11421997 + !le16 5880 diff --git a/src/index/count01.a b/src/index/count01.a index def64fa9d..93ed6adac 100644 --- a/src/index/count01.a +++ b/src/index/count01.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 299 +!word 300 diff --git a/src/index/count11.a b/src/index/count11.a index b09f39511..55d4dfe97 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 429 +!word 430 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 77023acb8..65ecdd50e 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 11471262 + !be24 11487774 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index e1d4ddde5..95c2e497e 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 11472016 + !be24 11488528 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 4a21f9912..ab465b63c 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 11472464 + !be24 11488976 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 706ecb013..2186a3a15 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 11425335 + !be24 11441815 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 0bb781022..8847a8fe9 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 11471748 + !be24 11488260 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 58cf9b707..8f23b04a6 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 11466623 + !be24 11483135 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 595131f4e..6f3f216a9 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 11465138 + !be24 11481650 !le16 1404 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 22a8202c7..ab30fdca7 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 11450755 - !le16 521 + !be24 11467251 + !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 685523501..787d79f19 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 11423189 + !be24 11439669 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 7345ba464..951b57a27 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 11426935 - !le16 6433 + !be24 11443415 + !le16 6449 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index cd1b67c00..21b351a8a 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 11471672 + !be24 11488184 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 80c0685f1..0a9f2a36f 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 11466542 + !be24 11483054 !le16 81 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 86138ea4c..9d68dfc89 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 11471815 + !be24 11488327 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 3e7c29829..c2a92bfd8 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 11451276 + !be24 11467788 !le16 4511 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index bc1c35e8a..ebd9dc616 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 11455787 + !be24 11472299 !le16 1591 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 4c2d870e5..f6445ac01 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 11457378 + !be24 11473890 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index fbbe5d1bf..4cbf2c6fb 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 11458431 + !be24 11474943 !le16 3237 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 552a4e1b6..3bf534de5 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 11461668 + !be24 11478180 !le16 2877 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index a212408ab..8e7d21fba 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 11464545 + !be24 11481057 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index ab8f49142..d90dc4546 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 11465024 + !be24 11481536 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 9e15c1215..ef96f3547 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 11472767 + !be24 11489279 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 48caf5233..3795e84d4 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 11438324 + !be24 11454820 !le16 3642 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 35ca9c484..d9d756165 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 11441966 + !be24 11458462 !le16 2795 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index dacda46bb..5347c04df 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 11411413 - !le16 6433 + !be24 11427877 + !le16 6449 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index 5c4b46bf8..1265a8c72 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 3703296 + !be24 3719680 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index bdbca0b21..a50394804 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 3719680 + !be24 3736064 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 6f08408c1..61b0d048d 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 3711488 + !be24 3727872 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 40b38f7d3..f68b979a5 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 11349925 + !be24 11366309 !le16 8283 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index b64e97651..c7b467895 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 11361862 - !le16 9127 + !be24 11378246 + !le16 9157 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 5f868e6d1..caeb99341 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 11375053 + !be24 11391477 !le16 11976 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index e547210cf..01369dd20 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 11392274 - !le16 13269 + !be24 11408698 + !le16 13299 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 2ffe0e9d3..a9fbadd2d 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 11426577 + !be24 11443057 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 4c65a4fc0..17b246a1a 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 11433368 + !be24 11449864 !le16 4956 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 0d43ddb36..48980a96f 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 11444761 + !be24 11461257 !le16 5994 diff --git a/src/prelaunch/catacombs.a b/src/prelaunch/catacombs.a new file mode 100644 index 000000000..f03c68ba1 --- /dev/null +++ b/src/prelaunch/catacombs.a @@ -0,0 +1,39 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/CATACOMBS",plain +*=$106 + + !source "src/prelaunch/common.a" + + lda #callback + sta $24AA + ldy #(x_e - x_b) - 1 +- lda x_b, y + sta $200, y + dey + bpl - + jmp $200 + +x_b !pseudopc $200 { + jmp $2400 ; decompress + +callback + sta $c008 + +RESET_VECTOR $873 + bit $c083 + lda #$8b + sta $BF0E + jsr DisableAccelerator + bit $c08b + sta $c009 + jmp $800 +} +x_e + +!if * > $1C0 { + !error "code is too large, ends at ", * +}