From 5de894565e36c27a799262da2579188a464d99a0 Mon Sep 17 00:00:00 2001 From: Peter Ferrie Date: Tue, 25 Aug 2020 13:56:03 -0700 Subject: [PATCH] build HDV instead of 2MG --- Makefile | 4 ++-- bin/changebootloader.js | 5 ++--- bin/changebootloader.sh | 2 +- res/{blank.2mg => blank.hdv} | Bin 33553984 -> 33553920 bytes winmake.bat | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) rename res/{blank.2mg => blank.hdv} (99%) diff --git a/Makefile b/Makefile index 295054c2a..3ef74ff8e 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ # adapted by 4am on 2018-08-19 # -DISK=4cade.2mg +DISK=4cade.hdv VOLUME=TOTAL.REPLAY # third-party tools required to build @@ -26,7 +26,7 @@ CADIUS=cadius EXOMIZER=exomizer mem -q -P23 -lnone dsk: md asm - cp res/blank.2mg build/"$(DISK)" >>build/log + cp res/blank.hdv build/"$(DISK)" >>build/log cp res/_FileInformation.txt build/ >>build/log $(CADIUS) ADDFILE build/"$(DISK)" "/$(VOLUME)/" "build/LAUNCHER.SYSTEM" >>build/log rsync -aP res/PREFS.CONF build/PREFS.CONF >> build/log diff --git a/bin/changebootloader.js b/bin/changebootloader.js index 7875c2efb..06dc1a5d0 100644 --- a/bin/changebootloader.js +++ b/bin/changebootloader.js @@ -1,7 +1,6 @@ a = new ActiveXObject("scripting.filesystemobject") b = a.opentextfile(WScript.Arguments(0)) -c = b.read(0x40) b.skip(0x200) -d = b.read(a.getfile(WScript.Arguments(0)).size-0x240) +d = b.read(a.getfile(WScript.Arguments(0)).size-0x200) b.close() -b=a.createtextfile(WScript.Arguments(0), 1).write(c+a.opentextfile(WScript.Arguments(1)).read(512)+d) +b=a.createtextfile(WScript.Arguments(0), 1).write(a.opentextfile(WScript.Arguments(1)).read(512)+d) diff --git a/bin/changebootloader.sh b/bin/changebootloader.sh index 9f4b8c6d4..bb0417d50 100755 --- a/bin/changebootloader.sh +++ b/bin/changebootloader.sh @@ -1,3 +1,3 @@ #!/bin/sh -dd of="$1" bs=1 seek=64 count=512 conv=notrunc < "$2" +dd of="$1" bs=1 count=512 conv=notrunc < "$2" diff --git a/res/blank.2mg b/res/blank.hdv similarity index 99% rename from res/blank.2mg rename to res/blank.hdv index 781f8fe643009bcd9241c648ca4fd9f76717ebcb..7c46b9ca9e2f9a645edb149f55e806d837d8997a 100644 GIT binary patch delta 1799 zcmWm9SJ)5&07l{GPbg9-qarI&ww6&jA(TYRNQ!7HnF-NwD2c388b}M36{4kOq&>A% zD5I3JTRs=>{W&xC>@U$HdLji9SQcMn$;!;8mmm}mzDJiAo zC^=e=kz=K_l##M>oE$IZ(Hk@VM=OXV`TTduP33yIL2i_rq?z0-&E*zpAuZ)rxlLNh?Q(~-mNwE>+DUuqARXmS=_H-yF6kn7 z%RO?h+$Zk$cX?DElOEDjdP#42T$Cr|N$DefbmM#!u3n!GL}yd`hTc$pv* z{2_nJU-Gy7Bmc^7*&};ppX~2TL4OLOP#h42(); z6?LOtTpjh}nrIN$#&yv!8b#x15>4a!xFK$go1$6V9L?jFXb~;r*0?QN#qDuNw2n5> zHrhq|=nx&_&gc}KF6#{qX}edDR<7f(n3cqX2W0r6ZsA1}m<@lp(omt#;2jv?_%42@wiJVwN;@mjndBjb%2 z6{BNJjE!;eX1o<|$M~2K6XTtDH{Of)mfoV^w?;t7A>9jdig;zKspBF*e0_ z@qPRdn`2A-7(d0&@k?xtZSiYtj~($_?2KLUd;Af9#$WMw{1gAi?${H1V_(5|_808? E4}P|oi2wiq delta 1324 zcmXAb2hZ7HWR%h_rD#w{Nk~Enp?PS0rJ&hDt_e zb`&y7Kc2gH?_K{r1tpgLTlpGITQsiUwO6aUh4|P1DJUpZsP2Eew}3I#3zzRN?&H1| zwut+=zePR3Vixy65AtA3c!(t}WogTJsAWCOavtsx9_djY?J*u}c`I1a;?Pq@nIM6}rectZ_4t9t`9cCQv2p@E$qa5uRA9AeY z9Pb1tI?2gS@nIkFQ6KYhpKz+vobHp(aHdZ=%h}FxuJe4_`99;bE^wjGxya{z!NtDl zOTO$YzUmT}`kJr1%;m0drEmDAZ~36t?OLx2H$t1o80UNZt+7u@?$@7 ztDpLrpZkSh`jy-K+Hd^U@BH2${L$_H2-%P9Pl}QQNHJ2J97ql#2a^)y5K@wqBBew3r;^i1by9E4hYrBiEAa$n~Tii{>> z$U|f-8AryG31lLfL?)9d6*?@&oyiY$rdFpUDogll(${CBKnfF?=T#nu diff --git a/winmake.bat b/winmake.bat index 54c903829..e61d283dd 100644 --- a/winmake.bat +++ b/winmake.bat @@ -7,7 +7,7 @@ rem a qkumba monstrosity from 2018-10-29 rem setlocal enabledelayedexpansion -set DISK=4cade.2mg +set DISK=4cade.hdv set VOLUME=TOTAL.REPLAY rem third-party tools required to build (must be in path) @@ -42,7 +42,7 @@ if "%1" equ "dsk" ( call :asm call :compress 2>nul del build\log -1>nul copy /y res\blank.2mg "build\%DISK%" >>build\log +1>nul copy /y res\blank.hdv "build\%DISK%" >>build\log 1>nul copy /y res\_FileInformation.txt build\ >>build\log %CADIUS% ADDFILE "build\%DISK%" "/%VOLUME%/" "build\LAUNCHER.SYSTEM" >>build\log 1>nul copy /y res\PREFS.CONF build\ >>build\log