diff --git a/Makefile b/Makefile index 1c27009d8..72610885b 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ EXOMIZER=exomizer mem -q -P23 -lnone dsk: index asmproboot asmlauncher cp res/blank.hdv build/"$(DISK)" cp res/_FileInformation.txt build/ - $(CADIUS) ADDFILE -C build/"$(DISK)" "/$(VOLUME)/" build/LAUNCHER.SYSTEM >>build/log + $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" build/LAUNCHER.SYSTEM -C >>build/log cp res/PREFS.CONF build/PREFS.CONF bin/padto.sh build/PREFS.CONF # @@ -53,7 +53,7 @@ dsk: index asmproboot asmlauncher build/PREFS.CONF \ res/Finder.Data \ res/Finder.Root; do \ - $(CADIUS) ADDFILE -C build/"$(DISK)" "/$(VOLUME)/" "$$f" >>build/log; \ + $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "$$f" -C >>build/log; \ done for f in \ res/DEMO \ @@ -62,16 +62,16 @@ dsk: index asmproboot asmlauncher build/FX \ build/PRELAUNCH; do \ rm -f "$$f"/.DS_Store; \ - $(CADIUS) ADDFOLDER -C build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" >>build/log; \ + $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/$$(basename $$f)" "$$f" -C >>build/log; \ done for i in 1 2 3 4 5 6; do \ $(CADIUS) RENAMEFILE build/"$(DISK)" "/$(VOLUME)/DEMO/SPCARTOON.$${i}$${i}" "SPCARTOON.$${i}." >>build/log; \ done $(PARALLEL) '$(CADIUS) EXTRACTVOLUME {} build/X/ >>build/log' ::: res/dsk/*.po rm -f build/X/**/.DS_Store build/X/**/PRODOS* build/X/**/LOADER.SYSTEM* - $(CADIUS) CREATEFOLDER -C build/"$(DISK)" "/$(VOLUME)/X/" >>build/log + $(CADIUS) CREATEFOLDER build/"$(DISK)" "/$(VOLUME)/X/" -C >>build/log for f in build/X/*; do \ - $(CADIUS) ADDFOLDER -C build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f" >>build/log; \ + $(CADIUS) ADDFOLDER build/"$(DISK)" "/$(VOLUME)/X/$$(basename $$f)" "$$f" -C >>build/log; \ done bin/changebootloader.sh build/"$(DISK)" build/proboothd diff --git a/res/ARTWORK.SHR.SCORES/ROACH.HOTEL b/res/ARTWORK.SHR.SCORES/ROACH.HOTEL new file mode 100644 index 000000000..8c7922550 --- /dev/null +++ b/res/ARTWORK.SHR.SCORES/ROACH.HOTEL @@ -0,0 +1 @@ + 139.99842571199625 diff --git a/res/ARTWORK.SHR.SCORES/ROADBLOCK b/res/ARTWORK.SHR.SCORES/ROADBLOCK new file mode 100644 index 000000000..d00491fd7 --- /dev/null +++ b/res/ARTWORK.SHR.SCORES/ROADBLOCK @@ -0,0 +1 @@ +1 diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/ROACH.HOTEL b/res/ARTWORK.SHR.UNCOMPRESSED/ROACH.HOTEL new file mode 100644 index 000000000..9d08aa352 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/ROACH.HOTEL differ diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/ROADBLOCK b/res/ARTWORK.SHR.UNCOMPRESSED/ROADBLOCK new file mode 100644 index 000000000..0b5ee801c Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/ROADBLOCK differ diff --git a/res/ARTWORK.SHR/ROACH.HOTEL b/res/ARTWORK.SHR/ROACH.HOTEL new file mode 100644 index 000000000..ec48b8408 Binary files /dev/null and b/res/ARTWORK.SHR/ROACH.HOTEL differ diff --git a/res/ARTWORK.SHR/ROADBLOCK b/res/ARTWORK.SHR/ROADBLOCK new file mode 100644 index 000000000..47123c3fc Binary files /dev/null and b/res/ARTWORK.SHR/ROADBLOCK differ diff --git a/res/ATTRACT/ROACH.HOTEL b/res/ATTRACT/ROACH.HOTEL index 1cc3ff1cc..ee95980b5 100644 --- a/res/ATTRACT/ROACH.HOTEL +++ b/res/ATTRACT/ROACH.HOTEL @@ -3,6 +3,7 @@ # This file is automatically generated # +ROACH.HOTEL=C ROACH.HOTEL=A [eof] diff --git a/res/ATTRACT/ROADBLOCK b/res/ATTRACT/ROADBLOCK index 55d352766..5503f5814 100644 --- a/res/ATTRACT/ROADBLOCK +++ b/res/ATTRACT/ROADBLOCK @@ -3,6 +3,7 @@ # This file is automatically generated # +ROADBLOCK=C ROADBLOCK=A [eof] diff --git a/res/SS/SHR4.CONF b/res/SS/SHR4.CONF index 1111b3555..623a71bf4 100644 --- a/res/SS/SHR4.CONF +++ b/res/SS/SHR4.CONF @@ -3,6 +3,7 @@ # MD +ROACH.HOTEL FROGGER DINO.EGGS DROL diff --git a/res/SS/SHR5.CONF b/res/SS/SHR5.CONF index 303859bba..4574d3bb8 100644 --- a/res/SS/SHR5.CONF +++ b/res/SS/SHR5.CONF @@ -6,6 +6,7 @@ DIAMOND.MINE LABYRINTH SNAKE.BYTE CRAZY.MAZEY +ROADBLOCK ZAXXON RM diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a index 47e3a825e..baf4d7b69 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 11693296 - !le16 4864 + !be24 11724320 + !le16 4898 diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a index 3c3433852..45d94c00f 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 11644318 + !be24 11675342 !le16 5343 diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a index fcd58a7bf..50fc3f743 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 11584458 + !be24 11615482 !le16 3654 diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a index 188f90f6b..22fb70fe2 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 11597306 + !be24 11628330 !le16 4074 diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a index 4ef61e4eb..ea1791f0a 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 11613393 + !be24 11644417 !le16 5245 diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a index e126b2fc4..4daf74cb5 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 11631974 + !be24 11662998 !le16 5880 diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a index 933b4f178..64a65af42 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 11698160 + !be24 11729218 !le16 410 diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a index 881b43b78..464504d68 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 11698914 + !be24 11729972 !le16 448 diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a index 7aa25ed6f..2b425f4dc 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 11699362 + !be24 11730420 !le16 303 diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a index facd3b549..5474b1add 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 11651807 + !be24 11682831 !le16 1242 diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a index e79009f31..9609d03e7 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 11698646 + !be24 11729704 !le16 67 diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a index a0a5f7d0d..16d984a8e 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 11693237 + !be24 11724261 !le16 59 diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a index 82e827cdd..279db85e9 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 11691703 + !be24 11722727 !le16 1437 diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a index 295c4f406..8ae93fd85 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 11677304 + !be24 11708328 !le16 537 diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a index 20c9dea06..06faed6c3 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 11649661 + !be24 11680685 !le16 2146 diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a index a52899a3e..6a0ccc7f2 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 11653407 + !be24 11684431 !le16 6464 diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a index 326225d86..6c27c62a4 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 11698570 + !be24 11729628 !le16 76 diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a index dca45867f..36560163e 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 11693140 + !be24 11724164 !le16 97 diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a index e955df4de..8db22cbad 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 11698713 + !be24 11729771 !le16 201 diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a index 14862df6d..cd960e1fd 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 11677841 + !be24 11708865 !le16 4511 diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a index 6afe5859f..6d642358e 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 11682352 + !be24 11713376 !le16 1591 diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a index 4b7c45fb0..b037e6b45 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 11683943 + !be24 11714967 !le16 1053 diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a index 3a1389d17..99d41edfd 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 11684996 + !be24 11716020 !le16 3237 diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a index f3a512c45..bfec02cc1 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 11688233 + !be24 11719257 !le16 2877 diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a index d0735315a..acfd2db46 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 11691110 + !be24 11722134 !le16 479 diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a index f26c4ab97..01d85bd84 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 11691589 + !be24 11722613 !le16 114 diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a index e95f49ccf..7ac6a7687 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 11699665 + !be24 11730723 !le16 2370 diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a index ce08e46b3..9c31be0a9 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 11664827 + !be24 11695851 !le16 4283 diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a index 62f5d13e9..42b034a1d 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 11669110 + !be24 11700134 !le16 2185 diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a index a99f83edf..8a255074f 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 11637854 + !be24 11668878 !le16 6464 diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a index 38712b4c8..428fd1756 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 11576138 + !be24 11607162 !le16 8320 diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a index 0ff373de8..8bc65fab6 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 11588112 + !be24 11619136 !le16 9194 diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a index 821b146f4..2d715c4c3 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 11601380 + !be24 11632404 !le16 12013 diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a index a1740153d..7a464be43 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 11618638 + !be24 11649662 !le16 13336 diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a index 5c9eaa7d1..5e2ca9ccd 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 11653049 + !be24 11684073 !le16 358 diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a index a486392b1..e8818dd1a 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 11659871 + !be24 11690895 !le16 4956 diff --git a/src/index/title.idx.a b/src/index/title.idx.a index f952fca0b..552f7920c 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 11671295 + !be24 11702319 !le16 6009