diff --git a/Makefile b/Makefile index c3d34c9f0..1bdf8ffd4 100644 --- a/Makefile +++ b/Makefile @@ -63,19 +63,17 @@ asmlauncher: md $(ACME) -r build/4cade.lst -DBUILDNUMBER=`git rev-list --count HEAD` -DRELBASE=`cat build/relbase.log | grep "RELBASE =" | cut -d"=" -f2 | cut -d"(" -f2 | cut -d")" -f1` src/4cade.a asmfx: md - touch build/log for f in src/fx/*.a; do grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log || true; done bin/buildfileinfo.sh build/FX "06" "6000" >>build/log asmprelaunch: md - touch build/log for f in src/prelaunch/*.a; do grep "^\!to" $${f} >/dev/null && $(ACME) $${f} >> build/log; done for f in res/TITLE.HGR/* res/TITLE.DHGR/*; do rsync --ignore-existing build/PRELAUNCH/STANDARD build/PRELAUNCH/$$(basename $$f); done chd: dsk chdman createhd -c none -i build/"$(DISK)" -o build/"$(DISK)".chd >>build/log -compress: +compress: md for f in res/ACTION.HGR.UNCOMPRESSED/*; do o=res/ACTION.HGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done for f in res/ACTION.DHGR.UNCOMPRESSED/*; do o=res/ACTION.DHGR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x4000 -o "$$o" >>build/log; done for f in res/ARTWORK.SHR.UNCOMPRESSED/*; do o=res/ARTWORK.SHR/$$(basename $$f); [ -f "$$o" ] || ${EXOMIZER} "$$f"@0x2000 -o "$$o" >>build/log; done @@ -89,6 +87,7 @@ mount: dsk md: mkdir -p build/X build/FX build/PRELAUNCH build/GAMEHELP + touch build/log clean: rm -rf build/ || rm -rf build diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/PHANTOMS.FIVE b/res/ARTWORK.SHR.UNCOMPRESSED/PHANTOMS.FIVE new file mode 100644 index 000000000..49d25d676 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/PHANTOMS.FIVE differ diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/PITFALL.II b/res/ARTWORK.SHR.UNCOMPRESSED/PITFALL.II new file mode 100644 index 000000000..7d94a0595 Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/PITFALL.II differ diff --git a/res/ARTWORK.SHR/PHANTOMS.FIVE b/res/ARTWORK.SHR/PHANTOMS.FIVE new file mode 100644 index 000000000..7f2dc5386 Binary files /dev/null and b/res/ARTWORK.SHR/PHANTOMS.FIVE differ diff --git a/res/ARTWORK.SHR/PITFALL.II b/res/ARTWORK.SHR/PITFALL.II new file mode 100644 index 000000000..05dc650f2 Binary files /dev/null and b/res/ARTWORK.SHR/PITFALL.II differ diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt index 57e8fdaca..5ab247fc2 100644 --- a/res/ARTWORK.SHR/_FileInformation.txt +++ b/res/ARTWORK.SHR/_FileInformation.txt @@ -127,9 +127,11 @@ ORILEYS.MINE=Type(06),AuxType(1FF8),Access(C3) OUTPOST=Type(06),AuxType(1FF8),Access(C3) PACMAN=Type(06),AuxType(1FF8),Access(C3) PAPERBOY=Type(06),AuxType(1FF8),Access(C3) +PHANTOMS.FIVE=Type(06),AuxType(1FF8),Access(C3) PHARAOHS.REVNG=Type(06),AuxType(1FF8),Access(C3) PIE.MAN=Type(06),AuxType(1FF8),Access(C3) PIPE.DREAM=Type(06),AuxType(1FF8),Access(C3) +PITFALL.II=Type(06),AuxType(1FF8),Access(C3) PITSTOP.II=Type(06),AuxType(1FF8),Access(C3) PLATOON=Type(06),AuxType(1FF8),Access(C3) POOYAN=Type(06),AuxType(1FF8),Access(C3) diff --git a/res/ATTRACT/PHANTOMS.FIVE b/res/ATTRACT/PHANTOMS.FIVE index bf6e6da7c..6f320fa26 100644 --- a/res/ATTRACT/PHANTOMS.FIVE +++ b/res/ATTRACT/PHANTOMS.FIVE @@ -3,6 +3,7 @@ # This file is automatically generated # +ARTWORK.SHR/PHANTOMS.FIVE=C ACTION.HGR/PHANTOMS.FIVE=A [eof] diff --git a/res/ATTRACT/PITFALL.II b/res/ATTRACT/PITFALL.II index 0051c497c..a1eb9c4b8 100644 --- a/res/ATTRACT/PITFALL.II +++ b/res/ATTRACT/PITFALL.II @@ -3,6 +3,7 @@ # This file is automatically generated # +ARTWORK.SHR/PITFALL.II=C ACTION.HGR/PITFALL.II2=A ACTION.HGR/PITFALL.II=A PITFALL.II=0 diff --git a/res/SS/SHR1.CONF b/res/SS/SHR1.CONF index b6f97bcdb..375ad23b5 100644 --- a/res/SS/SHR1.CONF +++ b/res/SS/SHR1.CONF @@ -11,5 +11,6 @@ SUMMER.GAMES.II INDIANA.JONES LOST.TOMB FALCONS +PITFALL.II [eof] diff --git a/res/SS/SHR2.CONF b/res/SS/SHR2.CONF index f8c190215..f23c325ff 100644 --- a/res/SS/SHR2.CONF +++ b/res/SS/SHR2.CONF @@ -11,5 +11,6 @@ ALIEN.TYPHOON LITTLE.COMP.PPL QIX ORBITRON +PHANTOMS.FIVE [eof]