Move utilities and disassembler into /utils, move Star Blazer into /star_blazer,...

diff --git a/.gitignore b/.gitignore
index 48bbc9e..b326429 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,27 +9,13 @@
 *.rel
 *.rst
 *.seed
-/disasm/alien_typhoon.asm
-/disasm/draw_misc.json
-/disasm/draw_misc_table.inc
-/disasm/galaxian.asm
-/disasm/object.json
-/disasm/object_data.inc
-/disasm/object_index.inc
-/disasm/shape.json
-/disasm/shape_data.inc
-/disasm/shape_index.inc
-/disasm/shape_data_pixel.inc
-/disasm/shape_index_pixel.inc
-/disasm/shape_pixel.json
-/disasm/star_blazer.asm
-/disasm/star_blazer.asm0
-/disasm/star_blazer.dsk
 /emu_65c02/emu_65c02
 /emu_65c02/cg_default/*.inc
 /emu_65c02/cg_default/*.pbm
 /emu_65c02/cg_default/*.png
 /emu_65c02/cg_default/*.ppm
+/galaxian/alien_typhoon.asm
+/galaxian/galaxian.asm
 /orig/APPLE Computer and Peripheral Card Roms Collection.zip
 /orig/Alien_Typhoon_1981_Starcraft.do
 /orig/Apple_DOS_v3.3_1980_Apple.do
@@ -52,5 +38,19 @@
 /shape/shape6.png
 /shape/shape_data.inc
 /shape/shape_index.inc
+/star_blazer/draw_misc.json
+/star_blazer/draw_misc_table.inc
+/star_blazer/object.json
+/star_blazer/object_data.inc
+/star_blazer/object_index.inc
+/star_blazer/shape.json
+/star_blazer/shape_data.inc
+/star_blazer/shape_index.inc
+/star_blazer/shape_data_pixel.inc
+/star_blazer/shape_index_pixel.inc
+/star_blazer/shape_pixel.json
+/star_blazer/star_blazer.asm
+/star_blazer/star_blazer.asm0
+/star_blazer/star_blazer.dsk
 /test/test.dsk
 /util/bootable.dsk

diff --git a/galaxian/Makefile b/galaxian/Makefile
new file mode 100644 (file)
index 0000000..7b59dc2
--- /dev/null
+++ b/galaxian/Makefile
@@ -0,0 +1,38 @@
+DOS33=../dos33fsprogs/utils/dos33fs-utils/dos33
+
+AS6500=../asxv5pxx/asxmak/linux/exe/as6500
+ASLINK=../asxv5pxx/asxmak/linux/exe/aslink
+
+LOAD_ADDR=0x800
+
+.PHONY: all
+all: \
+galaxian.asm \
+alien_typhoon.asm \
+
+galaxian.asm: \
+galaxian_trace.txt \
+galaxian.txt \
+../loader/galaxian.ihx
+       ../utils/disasm.py --trace=$^ $@ </dev/null
+
+alien_typhoon.asm: \
+alien_typhoon_trace.txt \
+alien_typhoon.txt \
+../loader/alien_typhoon.ihx
+       ../utils/disasm.py --trace=$^ $@
+
+.PHONY: clean
+clean:
+       rm -f \
+*.a2bin \
+*.bin \
+*.hlr \
+*.ihx \
+*.lst \
+*.map \
+*.o \
+*.rel \
+*.rst \
+galaxian.asm \
+alien_typhoon.asm

diff --git a/disasm/alien_typhoon.txt b/galaxian/alien_typhoon.txt
similarity index 100%
rename from disasm/alien_typhoon.txt
rename to galaxian/alien_typhoon.txt

diff --git a/disasm/alien_typhoon_trace.txt b/galaxian/alien_typhoon_trace.txt
similarity index 100%
rename from disasm/alien_typhoon_trace.txt
rename to galaxian/alien_typhoon_trace.txt

diff --git a/disasm/galaxian.txt b/galaxian/galaxian.txt
similarity index 100%
rename from disasm/galaxian.txt
rename to galaxian/galaxian.txt

diff --git a/disasm/galaxian_trace.txt b/galaxian/galaxian_trace.txt
similarity index 100%
rename from disasm/galaxian_trace.txt
rename to galaxian/galaxian_trace.txt

diff --git a/loader/Makefile b/loader/Makefile
index 0e23618..25fc95b 100755 (executable)
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -34,7 +34,7 @@ galaxian.ihx: \
 galaxian.a2bin \
 galaxian_segments.txt \
 Apple\ II+\ -\ 341-0020\ -\ Applesoft\ BASIC\ Autostart\ Monitor\ F800\ -\ 2716.bin
-       ./a2_load.py \
+       ../utils/a2_load.py \
 --f8_rom="Apple II+ - 341-0020 - Applesoft BASIC Autostart Monitor F800 - 2716.bin" \
 0x9707 $< $@ <galaxian_segments.txt
 
@@ -44,16 +44,16 @@ galaxian.a2bin: ../orig/Galaxian_1980_Starcraft.do
 alien_typhoon.ihx: \
 alien_typhoon.a2bin \
 alien_typhoon_segments.txt
-       ./a2_load.py 0x8f98 $< $@ <alien_typhoon_segments.txt
+       ../utils/a2_load.py 0x8f98 $< $@ <alien_typhoon_segments.txt
 
 alien_typhoon.a2bin: ../orig/Alien_Typhoon_1981_Starcraft.do
        ${DOS33} $< LOAD "ALIEN TYPHOON" $@
 
 star_blazer_pack_rev.a2bin: lzss_unpack_rev.bin star_blazer.ihx
-       ./a2_pack.py --rev ${LOAD_ADDR} $^ $@
+       ../utils/a2_pack.py --rev ${LOAD_ADDR} $^ $@
 
 star_blazer_pack_fwd.a2bin: lzss_unpack_fwd.bin star_blazer.ihx
-       ./a2_pack.py --fwd ${END_ADDR} $^ $@
+       ../utils/a2_pack.py --fwd ${END_ADDR} $^ $@
 
 lzss_unpack_rev.bin: lzss_unpack_rev.ihx
        ${HEX2BIN} $< $@
@@ -98,7 +98,7 @@ lzss_unpack_fwd_aux_mem.rel: lzss_unpack_fwd.asm
        rm lzss_unpack_fwd_aux_mem.asm
 
 star_blazer.ihx: star_blazer.a2bin star_blazer_segments.txt
-       ./a2_load.py 0x17d1 $< $@ <star_blazer_segments.txt
+       ../utils/a2_load.py 0x17d1 $< $@ <star_blazer_segments.txt
 
 star_blazer.a2bin: ../orig/Star_Blazer_1981_Star_Craft.do
        ${DOS33} $^ LOAD "STAR BLAZER" $@

diff --git a/disasm/palette.py b/shape/palette.py
similarity index 100%
rename from disasm/palette.py
rename to shape/palette.py

diff --git a/disasm/Makefile b/star_blazer/Makefile
similarity index 83%
rename from disasm/Makefile
rename to star_blazer/Makefile
index 06aa25d..ed9c624 100644 (file)
--- a/disasm/Makefile
+++ b/star_blazer/Makefile
@@ -7,22 +7,8 @@ LOAD_ADDR=0x800
 
 .PHONY: all
 all: \
-galaxian.asm \
-alien_typhoon.asm \
 star_blazer.dsk
 
-galaxian.asm: \
-galaxian_trace.txt \
-galaxian.txt \
-../loader/galaxian.ihx
-       ./disasm.py --trace=$^ $@ </dev/null
-
-alien_typhoon.asm: \
-alien_typhoon_trace.txt \
-alien_typhoon.txt \
-../loader/alien_typhoon.ihx
-       ./disasm.py --trace=$^ $@
-
 star_blazer.dsk: ../util/bootable.dsk star_blazer_pack_rev.a2bin
        cp ../util/bootable.dsk $@
        ${DOS33} $@ SAVE B star_blazer_pack_rev.a2bin "STAR BLAZER PACK REV"
@@ -32,7 +18,7 @@ star_blazer_pack_rev.a2bin: \
 star_blazer.ihx \
 ../loader/lzss_unpack_rev_aux_mem.bin \
 ../loader/star_blazer_pack_rev.a2bin
-       ../loader/a2_pack.py ${LOAD_ADDR} ../loader/lzss_unpack_rev_aux_mem.bin $< $@
+       ../utils/a2_pack.py ${LOAD_ADDR} ../loader/lzss_unpack_rev_aux_mem.bin $< $@
        -diff -q ../loader/star_blazer_pack_rev.a2bin $@
 
 # HGR
@@ -40,7 +26,7 @@ star_blazer.ihx \
 #star_blazer.ihx \
 #../loader/lzss_unpack_rev.bin \
 #../loader/star_blazer_pack_rev.a2bin
-#      ../loader/a2_pack.py ${LOAD_ADDR} ../loader/lzss_unpack_rev.bin $< $@
+#      ../utils/a2_pack.py ${LOAD_ADDR} ../loader/lzss_unpack_rev.bin $< $@
 #      -diff -q ../loader/star_blazer_pack_rev.a2bin $@
 
 star_blazer.ihx: star_blazer.rel
@@ -104,7 +90,7 @@ star_blazer.asm: \
 star_blazer_trace.txt \
 star_blazer.txt \
 star_blazer.asm.patch
-       ./disasm.py --trace=star_blazer_trace.txt star_blazer.txt $< $@
+       ../utils/disasm.py --trace=star_blazer_trace.txt star_blazer.txt $< $@
        cp $@ $@0
        patch $@ <$@.patch
 
@@ -120,8 +106,6 @@ clean:
 *.o \
 *.rel \
 *.rst \
-galaxian.asm \
-alien_typhoon.asm \
 star_blazer.asm \
 star_blazer.dsk \
 shape_index_pixel.inc \

diff --git a/disasm/draw_misc_compile.py b/star_blazer/draw_misc_compile.py
similarity index 100%
rename from disasm/draw_misc_compile.py
rename to star_blazer/draw_misc_compile.py

diff --git a/disasm/draw_misc_extract.py b/star_blazer/draw_misc_extract.py
similarity index 100%
rename from disasm/draw_misc_extract.py
rename to star_blazer/draw_misc_extract.py

diff --git a/disasm/export.sh b/star_blazer/export.sh
similarity index 100%
rename from disasm/export.sh
rename to star_blazer/export.sh

diff --git a/disasm/object_compile.py b/star_blazer/object_compile.py
similarity index 100%
rename from disasm/object_compile.py
rename to star_blazer/object_compile.py

diff --git a/disasm/object_defs.inc b/star_blazer/object_defs.inc
similarity index 100%
rename from disasm/object_defs.inc
rename to star_blazer/object_defs.inc

diff --git a/disasm/object_extract.py b/star_blazer/object_extract.py
similarity index 100%
rename from disasm/object_extract.py
rename to star_blazer/object_extract.py

diff --git a/disasm/object_shape_table.py b/star_blazer/object_shape_table.py
similarity index 100%
rename from disasm/object_shape_table.py
rename to star_blazer/object_shape_table.py

diff --git a/disasm/shape_compile.py b/star_blazer/shape_compile.py
similarity index 100%
rename from disasm/shape_compile.py
rename to star_blazer/shape_compile.py

diff --git a/disasm/shape_extract.py b/star_blazer/shape_extract.py
similarity index 100%
rename from disasm/shape_extract.py
rename to star_blazer/shape_extract.py

diff --git a/disasm/star_blazer.asm.patch b/star_blazer/star_blazer.asm.patch
similarity index 100%
rename from disasm/star_blazer.asm.patch
rename to star_blazer/star_blazer.asm.patch

diff --git a/disasm/star_blazer.txt b/star_blazer/star_blazer.txt
similarity index 100%
rename from disasm/star_blazer.txt
rename to star_blazer/star_blazer.txt

diff --git a/disasm/star_blazer_trace.txt b/star_blazer/star_blazer_trace.txt
similarity index 100%
rename from disasm/star_blazer_trace.txt
rename to star_blazer/star_blazer_trace.txt

diff --git a/loader/a2_bin2hex.py b/utils/a2_bin2hex.py
similarity index 100%
rename from loader/a2_bin2hex.py
rename to utils/a2_bin2hex.py

diff --git a/loader/a2_hex2bin.py b/utils/a2_hex2bin.py
similarity index 100%
rename from loader/a2_hex2bin.py
rename to utils/a2_hex2bin.py

diff --git a/loader/a2_load.py b/utils/a2_load.py
similarity index 100%
rename from loader/a2_load.py
rename to utils/a2_load.py

diff --git a/loader/a2_pack.py b/utils/a2_pack.py
similarity index 100%
rename from loader/a2_pack.py
rename to utils/a2_pack.py

diff --git a/disasm/disasm.py b/utils/disasm.py
similarity index 100%
rename from disasm/disasm.py
rename to utils/disasm.py

diff --git a/loader/entry_point.py b/utils/entry_point.py
similarity index 100%
rename from loader/entry_point.py
rename to utils/entry_point.py

diff --git a/disasm/item_len.py b/utils/item_len.py
similarity index 100%
rename from disasm/item_len.py
rename to utils/item_len.py