diff --git a/AppleCommander.jar b/AppleCommander.jar deleted file mode 100644 index f74e7cb..0000000 Binary files a/AppleCommander.jar and /dev/null differ diff --git a/DiskImageParts/BASIC.SYSTEM/BASIC.SYSTEM#FF2000 b/DiskImageParts/BASIC.SYSTEM/BASIC.SYSTEM#FF2000 new file mode 100644 index 0000000..c68b372 Binary files /dev/null and b/DiskImageParts/BASIC.SYSTEM/BASIC.SYSTEM#FF2000 differ diff --git a/DiskImageParts/BASIC.SYSTEM/_FileInformation.txt b/DiskImageParts/BASIC.SYSTEM/_FileInformation.txt new file mode 100644 index 0000000..e69de29 diff --git a/DiskImageParts/BITSY.BOOT/BITSY.BOOT#FF2000 b/DiskImageParts/BITSY.BOOT/BITSY.BOOT#FF2000 new file mode 100644 index 0000000..706c933 Binary files /dev/null and b/DiskImageParts/BITSY.BOOT/BITSY.BOOT#FF2000 differ diff --git a/DiskImageParts/BITSY.BOOT/_FileInformation.txt b/DiskImageParts/BITSY.BOOT/_FileInformation.txt new file mode 100644 index 0000000..e69de29 diff --git a/DiskImageParts/PRODOS/PRODOS#FF0000 b/DiskImageParts/PRODOS/PRODOS#FF0000 new file mode 100644 index 0000000..74aa839 Binary files /dev/null and b/DiskImageParts/PRODOS/PRODOS#FF0000 differ diff --git a/DiskImageParts/PRODOS/_FileInformation.txt b/DiskImageParts/PRODOS/_FileInformation.txt new file mode 100644 index 0000000..e69de29 diff --git a/DiskImageParts/QUIT.SYSTEM/QUIT.SYSTEM#FF2000 b/DiskImageParts/QUIT.SYSTEM/QUIT.SYSTEM#FF2000 new file mode 100644 index 0000000..201230d Binary files /dev/null and b/DiskImageParts/QUIT.SYSTEM/QUIT.SYSTEM#FF2000 differ diff --git a/DiskImageParts/QUIT.SYSTEM/_FileInformation.txt b/DiskImageParts/QUIT.SYSTEM/_FileInformation.txt new file mode 100644 index 0000000..e69de29 diff --git a/Makefile b/Makefile index 755a201..09de518 100644 --- a/Makefile +++ b/Makefile @@ -10,45 +10,57 @@ CL65=cl65 -AC=AppleCommander.jar -ADDR=800 - +CAD=./cadius +VOLNAME=GSAPP +IMG=DiskImageParts +EMU=/Applications/GSplus.app/Contents/MacOS/gsplus +ADDR=0800 +CODEBANK=CODEBANK\#060000 +CODEBANKE1=CODEBANKE1\#060800 +EXEC=$(PGM)\#06$(ADDR) + PGM=gscats MRSPRITE=../MrSprite/mrsprite GENART=Art/Generated CHROMA=a4dffb PALETTE=a4dffb a4dffb 008800 886611 cc9933 eebb44 dd6666 ff99aa 777777 ff0000 b7b7b7 dddddd 0077bb ffff00 000000 ffffff SPRITES=SpriteBank +SPRITEBANK=$(SPRITES)\#060000 FLIPLIST=$(wildcard Art/*Fan.gif) $(wildcard Art/*Spit*.gif) REMOTESYMBOLS=-Wl $(shell ./ParseMapFile.py *.map) -all: clean terrain_e1 $(PGM) loader - +all: clean diskimage terrain_e1 $(PGM) loader emulate +emulate: + # Leading hypen needed because GSPlus maddeningly returns code 1 (error) always and for no reason + -/Applications/GSplus.app/Contents/MacOS/gsplus + +diskimage: + $(CAD) CREATEVOLUME $(PGM).2mg $(VOLNAME) 800KB + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(IMG)/BITSY.BOOT/BITSY.BOOT#FF2000 + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(IMG)/QUIT.SYSTEM/QUIT.SYSTEM#FF2000 + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(IMG)/PRODOS/PRODOS#FF0000 + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(IMG)/BASIC.SYSTEM/BASIC.SYSTEM#FF2000 + $(PGM): @echo $(REMOTESYMBOLS) - @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh -C linkerConfig --cpu 65816 --start-addr 0000 -l$(PGM).lst $(REMOTESYMBOLS) $(PGM).s - java -jar $(AC) -d $(PGM).2mg CODEBANK - java -jar $(AC) -p $(PGM).2mg CODEBANK BIN 0x0000 < $(PGM) - java -jar $(AC) -d $(PGM).2mg $(SPRITES)00 - java -jar $(AC) -p $(PGM).2mg $(SPRITES)00 BIN 0x0000 < $(SPRITES)00.bin - rm -f $(PGM) + @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh -C linkerConfig --cpu 65816 --start-addr 0000 -l$(PGM).lst $(REMOTESYMBOLS) $(PGM).s -o $(CODEBANK) + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(CODEBANK) + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(SPRITEBANK) + rm -f $(CODEBANK) rm -f $(PGM).o rm -f terrain_e1.map - osascript V2Make.scpt $(PROJECT_DIR) $(PGM) loader: - @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --cpu 65816 --start-addr $(ADDR) -lloader.lst loader.s - java -jar $(AC) -d $(PGM).2mg $(PGM) - java -jar $(AC) -p $(PGM).2mg $(PGM) BIN 0x$(ADDR) < loader - rm -f loader + @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --cpu 65816 --start-addr $(ADDR) -lloader.lst loader.s -o $(EXEC) + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(EXEC) + rm -f $(EXEC) rm -f loader.o terrain_e1: - @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh -C linkerConfig --cpu 65816 --start-addr $(ADDR) -l -vm -m terrain_e1.map terrain_e1.s - java -jar $(AC) -d $(PGM).2mg CODEBANKE1 - java -jar $(AC) -p $(PGM).2mg CODEBANKE1 BIN 0x800 < terrain_e1 - rm -f terrain_e1 + @PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh -C linkerConfig --cpu 65816 --start-addr $(ADDR) -l -vm -m terrain_e1.map terrain_e1.s -o $(CODEBANKE1) + $(CAD) ADDFILE $(PGM).2mg /$(VOLNAME) $(CODEBANKE1) + rm -f $(CODEBANKE1) rm -f terrain_e1.o clean: @@ -61,7 +73,8 @@ clean: rm -f terrain_e1 rm -f Art/*m.gif rm -f $(GENART)/* - + rm -f $(PGM).2mg + .PHONY: art art: rm -f $(GENART)/* @@ -70,9 +83,7 @@ art: $(MRSPRITE) CODE $(GENART)"/*.gif" $(CHROMA) $(PALETTE) $(MRSPRITE) BANK $(GENART)"/*.txt" $(SPRITES) # $(MRSPRITE) WALLPAPER "Art/*.gif" $(CHROMA) ff0000 - mv $(GENART)/$(SPRITES)00.bin . + mv $(GENART)/$(SPRITES)00.bin ./$(SPRITEBANK) ./MerlinToCA65.sh $(GENART)/$(SPRITES)Src.txt > spritebank.s rm $(GENART)/*.txt rm -f Art/*m.gif - java -jar $(AC) -d $(PGM).2mg $(SPRITES)00 - java -jar $(AC) -p $(PGM).2mg $(SPRITES)00 BIN 0x0000 < $(SPRITES)00.bin diff --git a/SpriteBank#060000 b/SpriteBank#060000 new file mode 100644 index 0000000..f8b5680 Binary files /dev/null and b/SpriteBank#060000 differ diff --git a/SpriteBank00.bin b/SpriteBank00.bin deleted file mode 100644 index b474cea..0000000 Binary files a/SpriteBank00.bin and /dev/null differ diff --git a/V2Make.scpt b/V2Make.scpt deleted file mode 100644 index 6a7b579..0000000 Binary files a/V2Make.scpt and /dev/null differ diff --git a/cadius b/cadius new file mode 100755 index 0000000..3a756e0 Binary files /dev/null and b/cadius differ diff --git a/gscats.2mg b/gscats.2mg deleted file mode 100644 index 2167080..0000000 Binary files a/gscats.2mg and /dev/null differ