diff --git a/res/CACHE00.IDX b/res/CACHE00.IDX index 47834d04c..7ada9282f 100644 Binary files a/res/CACHE00.IDX and b/res/CACHE00.IDX differ diff --git a/res/CACHE01.IDX b/res/CACHE01.IDX index 8f6c79840..fc2da613e 100644 Binary files a/res/CACHE01.IDX and b/res/CACHE01.IDX differ diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index c699f25fb..8a4e79b93 100644 Binary files a/res/CACHE10.IDX and b/res/CACHE10.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index 57489d7db..33abb332c 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/GAMES.CONF b/res/GAMES.CONF index d4f87e637..8242e1194 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -161,6 +161,7 @@ 0001,FALCONS=Falcons 0006,FAT.CITY=Fat City 0001,FEDERATION=Federation +0004,FIRE.AND.ICE=Fire and Ice 0001,FIREBIRD=Firebird 0000,FIREBUG=Firebug 0110,FLAPPLE.BIRD=Flapple Bird diff --git a/res/TITLE.HGR.UNPACKED/FIRE.AND.ICE b/res/TITLE.HGR.UNPACKED/FIRE.AND.ICE new file mode 100644 index 000000000..c6c9e0377 Binary files /dev/null and b/res/TITLE.HGR.UNPACKED/FIRE.AND.ICE differ diff --git a/res/TITLE.HGR/FIRE.AND.ICE b/res/TITLE.HGR/FIRE.AND.ICE new file mode 100644 index 000000000..d7a9d39d1 Binary files /dev/null and b/res/TITLE.HGR/FIRE.AND.ICE differ diff --git a/res/dsk/fire and ice 12k file PRODOS (san inc pack).po b/res/dsk/fire and ice 12k file PRODOS (san inc pack).po new file mode 100644 index 000000000..ab814e678 Binary files /dev/null and b/res/dsk/fire and ice 12k file PRODOS (san inc pack).po differ diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index bb25e8ff4..5f616fd2e 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 12035029 + !be24 12043054 !le16 5198 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 5ee50c73c..6980c4d95 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 11985716 + !be24 11993703 !le16 5362 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 04f2fc0c5..17d82e89b 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 11925028 - !le16 3708 + !be24 11932744 + !le16 3746 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 821713bed..165183626 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 11938084 - !le16 4128 + !be24 11945874 + !le16 4166 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 5d715a587..99f24daa6 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 11954403 - !le16 5299 + !be24 11962267 + !le16 5333 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 899c22127..638ed8308 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 11973216 - !le16 5934 + !be24 11981150 + !le16 5968 diff --git a/src/index/count00.a b/src/index/count00.a index 7e95a8fde..40f828698 100644 --- a/src/index/count00.a +++ b/src/index/count00.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 279 +!word 280 diff --git a/src/index/count01.a b/src/index/count01.a index 2ddb16711..32a1948d0 100644 --- a/src/index/count01.a +++ b/src/index/count01.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 306 +!word 307 diff --git a/src/index/count10.a b/src/index/count10.a index dded71134..d36616f69 100644 --- a/src/index/count10.a +++ b/src/index/count10.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 395 +!word 396 diff --git a/src/index/count11.a b/src/index/count11.a index 55cce3308..c69fde769 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 437 +!word 438 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 472265120..247f39ab9 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 12040227 + !be24 12048252 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index c4c48331f..b86c1bb26 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 12040981 + !be24 12049006 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index c6ba70989..36c4551f1 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 12041429 + !be24 12049454 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 95822083e..85d66e675 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 11993224 + !be24 12001211 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index 445f757ad..37235f645 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 12040713 + !be24 12048738 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index 03d8b4ed9..57a146d08 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 12034970 + !be24 12042995 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 77d7fd060..9a0895d93 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 12033436 + !be24 12041461 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index af98a462a..39ef94063 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 12018977 + !be24 12027002 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index d465ad1fd..8b4bc4424 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 11991078 + !be24 11999065 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index 01d243354..cfd6c1771 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 11994824 - !le16 6566 + !be24 12002811 + !le16 6585 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index c1a5b46fa..4fa6eb52f 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 12040637 + !be24 12048662 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 0971fdc82..3e56df107 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 12034873 + !be24 12042898 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 0c4b50cb1..8bf894f8d 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 12040780 + !be24 12048805 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index df6aadc0b..43bb0efbc 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 12019514 + !be24 12027539 !le16 4511 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index cfc5392d9..a84ba41a8 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 12024025 + !be24 12032050 !le16 1625 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 6c785e54f..4c7d471f0 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 12025650 + !be24 12033675 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 7a21bffca..93591a51f 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 12026703 + !be24 12034728 !le16 3250 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index 9c791eb25..a6108d4dd 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 12029953 + !be24 12037978 !le16 2890 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 86ce1b4d3..81ab0c3af 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 12032843 + !be24 12040868 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 7f6ef2567..9985fe9c5 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 12033322 + !be24 12041347 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 978561d17..76843d40f 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 12041732 + !be24 12049757 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 111770596..8435e0535 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 12006368 + !be24 12014374 !le16 4300 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 41176c603..23176b088 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 12010668 + !be24 12018674 !le16 2198 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 3db36a7c6..2c2d6a4f2 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 11979150 - !le16 6566 + !be24 11987118 + !le16 6585 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index b7c8a527f..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 3774976 + !be24 3782656 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index c2d830e26..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 3791360 + !be24 3799040 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index 346ae365e..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 3783168 + !be24 3790848 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 23d7f1822..f655a7913 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 11916554 - !le16 8474 + !be24 11924234 + !le16 8510 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index e7ab83f29..eba667b0d 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 11928736 - !le16 9348 + !be24 11936490 + !le16 9384 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 19ccc8d0e..bf8052471 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 11942212 - !le16 12191 + !be24 11950040 + !le16 12227 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 90b827590..fd0e9bcd5 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 11959702 - !le16 13514 + !be24 11967600 + !le16 13550 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 879d18c8e..8c1bb3dc9 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 11994466 + !be24 12002453 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 098981fb9..01e271b43 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 12001390 + !be24 12009396 !le16 4978 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index b2217c791..0a6945b73 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 12012866 - !le16 6111 + !be24 12020872 + !le16 6130 diff --git a/src/prelaunch/fire.and.ice.a b/src/prelaunch/fire.and.ice.a new file mode 100644 index 000000000..3595cf518 --- /dev/null +++ b/src/prelaunch/fire.and.ice.a @@ -0,0 +1,28 @@ +;license:MIT +;(c) 2022 by qkumba + +!cpu 6502 +!to "build/PRELAUNCH.INDEXED/FIRE.AND.ICE",plain +*=$106 + + !source "src/prelaunch/common.a" + + +ENABLE_ACCEL + lda #$60 + sta $27BD + jsr $2760 ; decompress + +READ_RAM2_NO_WRITE + lda MachineStatus + and #CHEATS_ENABLED + beq + + lda #$a5 + sta $17DF ; patch - don't decrease fuel + sta $18E6 ; patch - don't decrease lives ++ + jsr DisableAccelerator + +READ_ROM_NO_WRITE + jmp $8E00 + +!if * > $1C0 { + !error "code is too large, ends at ", * +}