diff --git a/res/ACTION.HGR.UNCOMPRESSED/FS2 b/res/ACTION.HGR.UNCOMPRESSED/FS2 deleted file mode 100644 index efeed15b5..000000000 Binary files a/res/ACTION.HGR.UNCOMPRESSED/FS2 and /dev/null differ diff --git a/res/ACTION.HGR/FS2 b/res/ACTION.HGR/FS2 deleted file mode 100644 index d97f8d768..000000000 Binary files a/res/ACTION.HGR/FS2 and /dev/null differ diff --git a/res/ARTWORK.SHR.SCORES/FS2 b/res/ARTWORK.SHR.SCORES/FS2 deleted file mode 100644 index b696c2f75..000000000 --- a/res/ARTWORK.SHR.SCORES/FS2 +++ /dev/null @@ -1 +0,0 @@ - 232.2164999224019 diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/FS2 b/res/ARTWORK.SHR.UNCOMPRESSED/FS2 deleted file mode 100644 index 563b86c9e..000000000 Binary files a/res/ARTWORK.SHR.UNCOMPRESSED/FS2 and /dev/null differ diff --git a/res/ARTWORK.SHR/FS2 b/res/ARTWORK.SHR/FS2 deleted file mode 100644 index cf03882d8..000000000 Binary files a/res/ARTWORK.SHR/FS2 and /dev/null differ diff --git a/res/ATTRACT/FS2 b/res/ATTRACT/FS2 deleted file mode 100644 index bd92759ca..000000000 --- a/res/ATTRACT/FS2 +++ /dev/null @@ -1,9 +0,0 @@ -# -# Attract mode for FS2 -# This file is automatically generated -# - -FS2=C -FS2=A - -[eof] diff --git a/res/CACHE00.IDX b/res/CACHE00.IDX index 26cf2cc89..c506f1f57 100644 Binary files a/res/CACHE00.IDX and b/res/CACHE00.IDX differ diff --git a/res/CACHE01.IDX b/res/CACHE01.IDX index 7c6be8d8d..57d87e829 100644 Binary files a/res/CACHE01.IDX and b/res/CACHE01.IDX differ diff --git a/res/CACHE10.IDX b/res/CACHE10.IDX index 0864c37fc..970286edc 100644 Binary files a/res/CACHE10.IDX and b/res/CACHE10.IDX differ diff --git a/res/CACHE11.IDX b/res/CACHE11.IDX index 340c2e2b2..c77419bd1 100644 Binary files a/res/CACHE11.IDX and b/res/CACHE11.IDX differ diff --git a/res/GAMES.CONF b/res/GAMES.CONF index b4d49064e..2e8e7debd 100755 --- a/res/GAMES.CONF +++ b/res/GAMES.CONF @@ -162,7 +162,6 @@ 0001,FIREBIRD=Firebird 0000,FIREBUG=Firebug 0110,FLAPPLE.BIRD=Flapple Bird -0000,FS2=Flight Simulator II 0000,FLIP.OUT=Flip Out 0001,FLOBYNOID=Flobynoid 0004,FLOPPY=Floppy diff --git a/res/SS/ACTIONEFG7.CONF b/res/SS/ACTIONEFG7.CONF index b5e910a73..3694f4f4f 100644 --- a/res/SS/ACTIONEFG7.CONF +++ b/res/SS/ACTIONEFG7.CONF @@ -4,7 +4,6 @@ FLY.WARS GALACTIC.ATTACK -FS2 EARLY.BIRD GADGETZ3=GADGETZ FEDERATION diff --git a/res/SS/EFG1.CONF b/res/SS/EFG1.CONF index 842602972..ae3e09072 100644 --- a/res/SS/EFG1.CONF +++ b/res/SS/EFG1.CONF @@ -11,6 +11,5 @@ GLUTTON EARLY.BIRD GREMLINS GENETIC.DRIFT -FS2 [eof] diff --git a/res/SS/SHR18.CONF b/res/SS/SHR18.CONF index e98e59c02..3a6937417 100644 --- a/res/SS/SHR18.CONF +++ b/res/SS/SHR18.CONF @@ -8,6 +8,5 @@ FREE.FALL RED.ALERT CYCLOD ALCAZAR -FS2 [eof] diff --git a/res/SS/SUBLOGIC.CONF b/res/SS/SUBLOGIC.CONF index 7df8b4918..8b8bdcc60 100644 --- a/res/SS/SUBLOGIC.CONF +++ b/res/SS/SUBLOGIC.CONF @@ -3,7 +3,6 @@ # NM -FS2 ROADBLOCK [eof] diff --git a/res/TITLE.HGR.UNPACKED/FS2 b/res/TITLE.HGR.UNPACKED/FS2 deleted file mode 100644 index a39a6e938..000000000 Binary files a/res/TITLE.HGR.UNPACKED/FS2 and /dev/null differ diff --git a/res/TITLE.HGR/FS2 b/res/TITLE.HGR/FS2 deleted file mode 100644 index 21864e303..000000000 Binary files a/res/TITLE.HGR/FS2 and /dev/null differ diff --git a/res/dsk/flight simulator 2 PRODOS (san inc pack).po b/res/dsk/flight simulator 2 PRODOS (san inc pack).po deleted file mode 100644 index 5b5a19480..000000000 Binary files a/res/dsk/flight simulator 2 PRODOS (san inc pack).po and /dev/null differ diff --git a/res/history.md b/res/history.md index 42fd10ae1..2eca3e3dc 100644 --- a/res/history.md +++ b/res/history.md @@ -135,6 +135,7 @@ - Bop'n Wrestle - California Games - Fight Night +- Flight Simulator II - Formula 1 Racer - Fuji Crowded Speedway - Hardball diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index b865a359a..61394f72e 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 12025383 - !le16 5208 + !be24 11994262 + !le16 5198 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 692bb8db5..f631021f7 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 11976226 + !be24 11945145 !le16 5362 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index 89a6c3b51..f3c07d12b 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 11916122 - !le16 3670 + !be24 11885233 + !le16 3650 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 45247c641..836ba9f07 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 11929037 - !le16 4090 + !be24 11898094 + !le16 4070 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 5788ea75d..c0b1446dd 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 11945191 - !le16 5261 + !be24 11914194 + !le16 5241 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index 339b44447..6c01f2f4f 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 11963839 - !le16 5896 + !be24 11932788 + !le16 5876 diff --git a/src/index/count00.a b/src/index/count00.a index e738178c7..ed398811f 100644 --- a/src/index/count00.a +++ b/src/index/count00.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 276 +!word 275 diff --git a/src/index/count01.a b/src/index/count01.a index f729cc016..6d6097c0b 100644 --- a/src/index/count01.a +++ b/src/index/count01.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 303 +!word 302 diff --git a/src/index/count10.a b/src/index/count10.a index b5be88ae1..f5e7158e6 100644 --- a/src/index/count10.a +++ b/src/index/count10.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 391 +!word 390 diff --git a/src/index/count11.a b/src/index/count11.a index a4b7b691e..1f034d492 100644 --- a/src/index/count11.a +++ b/src/index/count11.a @@ -3,4 +3,4 @@ ; ; This file is automatically generated ; -!word 433 +!word 432 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 85370232d..1db36a699 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 12030591 + !be24 11999460 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 59ddd0fdc..4e5ceefe9 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 12031345 + !be24 12000214 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 0016d0243..eb5f22f96 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 12031793 + !be24 12000662 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index 5b735ec0f..9e6bdf2a5 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 11983734 + !be24 11952653 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index ed732cc81..44131107a 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 12031077 + !be24 11999946 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index ca6451f7d..4f3d702b2 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 12025324 + !be24 11994203 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 156458f95..aa4d1b492 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 12023790 + !be24 11992669 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index f98f236dc..75cfd08d6 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 12009334 + !be24 11978223 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 44acedce8..ae4f727a8 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 11981588 + !be24 11950507 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index c4e006ac5..5bd8600cf 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 11985334 - !le16 6491 + !be24 11954253 + !le16 6481 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 6a82587aa..629b82af9 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 12031001 + !be24 11999870 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index 8730772b0..75120e8c1 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 12025227 + !be24 11994106 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index 3dcd93927..51f7375bf 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 12031144 + !be24 12000013 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index e50015347..112c8ba46 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 12009871 + !be24 11978760 !le16 4511 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 753ca3a3a..af549b231 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 12014382 - !le16 1635 + !be24 11983271 + !le16 1625 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 600690232..41cc49da7 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 12016017 + !be24 11984896 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 2a11d6793..f2f45a7b1 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 12017070 + !be24 11985949 !le16 3250 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index b4e136a5b..d5e7814f1 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 12020320 + !be24 11989199 !le16 2877 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index 650832135..5370c7bbe 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 12023197 + !be24 11992076 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index 0fffca5ad..09afa5a8e 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 12023676 + !be24 11992555 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index 01e7a5503..041343893 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 12032096 + !be24 12000965 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index 5603ea508..89e1ef39d 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 11996803 - !le16 4310 + !be24 11965712 + !le16 4300 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 51fed0376..eff2d055a 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 12001113 + !be24 11970012 !le16 2185 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index 2da333c2b..64792ebec 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 11969735 - !le16 6491 + !be24 11938664 + !le16 6481 diff --git a/src/index/res.cover.idx.a b/src/index/res.cover.idx.a index c9c18622d..43d2b5973 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 3744256 + !be24 3736064 !le16 8192 diff --git a/src/index/res.help.idx.a b/src/index/res.help.idx.a index 9b473b838..9e0178395 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 3760640 + !be24 3752448 !le16 8192 diff --git a/src/index/res.title.idx.a b/src/index/res.title.idx.a index e4c0c95da..d787daecc 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 3752448 + !be24 3744256 !le16 8192 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index aac4972d6..379bb2a62 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 11907751 - !le16 8371 + !be24 11876896 + !le16 8337 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 380b8f1c3..ebea6b3d9 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 11919792 - !le16 9245 + !be24 11888883 + !le16 9211 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index d37742462..84d2ea98a 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 11933127 - !le16 12064 + !be24 11902164 + !le16 12030 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index 6f6ab98b4..0d605c349 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 11950452 - !le16 13387 + !be24 11919435 + !le16 13353 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 069b4d36d..e7a3a07db 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 11984976 + !be24 11953895 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index 95e819d71..90a88b1ad 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 11991825 + !be24 11960734 !le16 4978 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index 566fff911..01a4caf3b 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 12003298 - !le16 6036 + !be24 11972197 + !le16 6026 diff --git a/src/prelaunch/fs2.a b/src/prelaunch/fs2.a deleted file mode 100755 index 30a7150c0..000000000 --- a/src/prelaunch/fs2.a +++ /dev/null @@ -1,38 +0,0 @@ -;license:MIT -;(c) 2019 by Frank M. - -!cpu 6502 -!to "build/PRELAUNCH.INDEXED/FS2",plain -*=$106 - - !source "src/prelaunch/common.a" - - ;+ENABLE_ACCEL ; can't - - lda #$2C - sta $1C0 - lda #$82 - sta $1C1 - lda #$C0 - sta $1C2 - lda #$4C ; add reboot hook @ $1C0 - sta $1C3 - lda #$A6 - sta $1C4 - lda #$FA - sta $1C5 - - lda #$C0 - sta $82A8 ; cloned to $3F2 - sta $7D43 ; cloned to $FFFC - lda #$01 - sta $82A9 ; cloned to $3F3 - sta $7D46 ; cloned to $FFFD - lda #$A4 - sta $82A0 ; cloned to $3F4 - - jmp $2499 - -!if * > $1C0 { - !error "code is too large, ends at ", * -}