diff --git a/.gitignore b/.gitignore index e54e175..dcc1bf5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ loader/tools/cc1541/cc1541 loader/samples/minexample/*.bak loader/samples/minexample/*.o +loader/samples/minexample/*.zx0 +loader/samples/minexample/*.zx0.prg diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..90d6216 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "loader/samples/minexample/zx02"] + path = loader/samples/minexample/zx02 + url = https://github.com/dmsc/zx02.git diff --git a/loader/Makefile b/loader/Makefile index a7cac7a..aa6c984 100755 --- a/loader/Makefile +++ b/loader/Makefile @@ -10,7 +10,7 @@ endif CD = cd PRINTF = printf MKDIR = mkdir -GREP = ggrep +GREP = grep ZIP = zip -9 --must-match ZIP_NO_PATHS = $(ZIP) -j ifneq ($(VERSION),) diff --git a/loader/samples/minexample/badguyz.bin b/loader/samples/minexample/badguy.bin similarity index 100% rename from loader/samples/minexample/badguyz.bin rename to loader/samples/minexample/badguy.bin diff --git a/loader/samples/minexample/badguy.zx0 b/loader/samples/minexample/badguy.zx0 deleted file mode 100644 index 678e4f8..0000000 Binary files a/loader/samples/minexample/badguy.zx0 and /dev/null differ diff --git a/loader/samples/minexample/badguy.zx0.prg b/loader/samples/minexample/badguy.zx0.prg deleted file mode 100644 index 747c87d..0000000 Binary files a/loader/samples/minexample/badguy.zx0.prg and /dev/null differ diff --git a/loader/samples/minexample/conv_zx0.sh b/loader/samples/minexample/conv_zx0.sh deleted file mode 100644 index 2cb2dd1..0000000 --- a/loader/samples/minexample/conv_zx0.sh +++ /dev/null @@ -1,25 +0,0 @@ -zx02/zx02 badguyz.bin badguy.zx0 -printf "\x00\x80" > badguy.zx0.prg -cat badguy.zx0 >> badguy.zx0.prg -python3 aart_lz.py tilemap.bin tilemap.bin.lz -zx02/zx02 title_320-prepared.bin title_320-prepared.zx0 -printf "\x00\x80" > title_320-prepared.zx0.prg -cat title_320-prepared.zx0 >> title_320-prepared.zx0.prg -zx02/zx02 tower.bin tower.zx0 -printf "\x00\x80" > tower.zx0.prg -cat tower.zx0 >> tower.zx0.prg -zx02/zx02 tower_beam.bin tower_beam.zx0 -printf "\x00\x80" > tower_beam.zx0.prg -cat tower_beam.zx0 >> tower_beam.zx0.prg -zx02/zx02 field.bin field.zx0 -printf "\x00\x80" > field.zx0.prg -cat field.zx0 >> field.zx0.prg -zx02/zx02 falling_star.bin falling_star.zx0 -printf "\x00\x80" > falling_star.zx0.prg -cat falling_star.zx0 >> falling_star.zx0.prg -zx02/zx02 lilia.bin lilia.zx0 -printf "\x00\x80" > lilia.zx0.prg -cat lilia.zx0 >> lilia.zx0.prg -zx02/zx02 lilia_hero.bin lilia_hero.zx0 -printf "\x00\x80" > lilia_hero.zx0.prg -cat lilia_hero.zx0 >> lilia_hero.zx0.prg \ No newline at end of file diff --git a/loader/samples/minexample/falling_star.zx0 b/loader/samples/minexample/falling_star.zx0 deleted file mode 100644 index a19134d..0000000 Binary files a/loader/samples/minexample/falling_star.zx0 and /dev/null differ diff --git a/loader/samples/minexample/falling_star.zx0.prg b/loader/samples/minexample/falling_star.zx0.prg deleted file mode 100644 index 9324e8d..0000000 Binary files a/loader/samples/minexample/falling_star.zx0.prg and /dev/null differ diff --git a/loader/samples/minexample/field.zx0 b/loader/samples/minexample/field.zx0 deleted file mode 100644 index 1af5fd0..0000000 Binary files a/loader/samples/minexample/field.zx0 and /dev/null differ diff --git a/loader/samples/minexample/field.zx0.prg b/loader/samples/minexample/field.zx0.prg deleted file mode 100644 index ccc510b..0000000 Binary files a/loader/samples/minexample/field.zx0.prg and /dev/null differ diff --git a/loader/samples/minexample/lilia.zx0 b/loader/samples/minexample/lilia.zx0 deleted file mode 100644 index 03a4acb..0000000 Binary files a/loader/samples/minexample/lilia.zx0 and /dev/null differ diff --git a/loader/samples/minexample/lilia.zx0.prg b/loader/samples/minexample/lilia.zx0.prg deleted file mode 100644 index 0e0ffc0..0000000 Binary files a/loader/samples/minexample/lilia.zx0.prg and /dev/null differ diff --git a/loader/samples/minexample/lilia_hero.zx0 b/loader/samples/minexample/lilia_hero.zx0 deleted file mode 100644 index 3eacdb1..0000000 Binary files a/loader/samples/minexample/lilia_hero.zx0 and /dev/null differ diff --git a/loader/samples/minexample/lilia_hero.zx0.prg b/loader/samples/minexample/lilia_hero.zx0.prg deleted file mode 100644 index 3220173..0000000 Binary files a/loader/samples/minexample/lilia_hero.zx0.prg and /dev/null differ