Finally fix damaged ship gfx

1 files changed, 11 insertions, 45 deletions

diff --git a/Makefile b/Makefile
index 801b6a1..16875d3 100644
--- a/Makefile
+++ b/Makefile
@@ -88,13 +88,6 @@ PERLFLAGS=-C0
 
 PERLF=$(PERL) $(PERLFLAGS)
 
-# A few files have no make rules here. LORCHA.DAT is generated as a
-# side-effect of generating taifont.xex. It's a 49-byte (7x7) blob of
-# Atari "internal" screen codes.
-
-# LORCHA.DAT, and PORTSTAT.DAT aren't deleted by a
-# 'make clean'.
-
 # romfont is the 1K font extracted from the Atari 800 OS, with a
 # command like:
 # dd if=atariosb.rom of=1 bs=256 skip=8 count=4
@@ -255,7 +248,7 @@ help.dat: help.txt text2screen.pl
 
 # The main executable. All the C and asm code goes here, except the init
 # segment in newtitle.s.
-taimain.xex: $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(TAIMAIN_HDRS) $(BIGNUM_SRC) $(BIGNUM_HDRS) $(TAIMAIN_LIBS) messages.c
+taimain.xex: $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(TAIMAIN_HDRS) $(BIGNUM_SRC) $(BIGNUM_HDRS) $(TAIMAIN_LIBS) messages.c LORCHA.DAT
 	$(CC) -m taipan.map $(CFLAGS) $(BIGNUM_CFLAGS) -o taimain.xex $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(BIGNUM_SRC) $(TAIMAIN_LIBS)
 
 #cl65 --mapfile taipan.map $(CFLAGS) -o taimain.xex taipan.c sounds.c rand.s draw_lorcha.s timed_getch.s jsleep.s portstat.s console.s
@@ -270,14 +263,13 @@ taipan.lst: taipan.c
 sounds.lst: sounds.c sounds.h
 	$(CC) -m sounds.map $(CFLAGS) -c -o /dev/null -l sounds.lst -T sounds.c
 
+LORCHA.DAT: taifont.xex
+
 # The font gets loaded into RAM, in the area reserved by the
 # -D__RESERVED_MEMORY__ option to cl65. To actually use the font,
 # taimain.xex contains code that sets CHBAS ($02f4).
-# Not mentioned in any make rule: convfont also creates LORCHA.DAT,
-# which draw_lorcha.s depends on (so we touch draw_lorcha.s here).
 taifont.xex: convfont romfont font
 	cat romfont font | ./convfont -x > taifont.xex
-	touch draw_lorcha.s
 
 # Used by the cartridge build, but not the disk (xex) binary. This just
 # builds the font without the Atari 6-byte binary load header. It ends
@@ -397,7 +389,7 @@ testcart: clean cart
 
 # Obligatory clean and distclean rules.
 clean:
-	rm -f *.o *.lst convfont mkcart gzip2deflate *.xex AUTORUN.SYS taipan.atr dos2.atr mydos.atr fenders.atr ver.dat help.dat tags cartmsg.dat splitrom.raw.* taipan.rom taipan.cart bank[0-9] fill256 blankbank romable_taimain.raw splitrom.raw.* comptitle.s comptitle.dat conio/*.o conio/*.lib messages.c textcomp titledata.dat cartbank2.cfg
+	rm -f *.o *.lst convfont mkcart gzip2deflate *.xex AUTORUN.SYS taipan.atr dos2.atr mydos.atr fenders.atr ver.dat help.dat tags cartmsg.dat splitrom.raw.* taipan.rom taipan.cart bank[0-9] fill256 blankbank romable_taimain.raw splitrom.raw.* comptitle.s comptitle.dat conio/*.o conio/*.lib messages.c textcomp titledata.dat cartbank2.cfg LORCHA.DAT DAMAGED.DAT lorcha.txt damaged.txt
 
 distclean: clean
 	rm -f *~ core .*.swp 1.* 2.* 1 2 3 map map.* *.map a b c foo bar baz
@@ -412,42 +404,16 @@ procsizes: clean all taipan.lst
 	$(PERLF) procsizes.pl > procsizes
 	cat procsizes
 
-# Cruft. Was used for testing the enemy ship animation.
-lorchatest: lorchatest.c draw_lorcha.s taifont.xex
-	$(CC) -t atari -O -T -o lorchatest1.xex lorchatest.c draw_lorcha.s
-	cat taifont.xex lorchatest1.xex > lorchatest.xex
-	atari800 -nobasic lorchatest.xex
-
-#### cruft, from when I was planning to use a 32K cart:
-# this was a blind alley: zlib is too slow to decompress, plus there's
-# no need to compress taimain.xex since I'm able to use a 64K cart.
+# These 2 are informational only, for when you're editing the ship
+# graphics in convfont.c.
+lorcha.txt: shipshape.pl LORCHA.DAT
+	$(PERLF) shipshape.pl LORCHA.DAT > lorcha.txt
 
-# gzip2deflate downloaded from https://github.com/pfusik/zlib6502
-# I could have used deflator.c that ships with cc65's source, but
-# it's deprecated by its own upstream (same author as gzip2deflate).
-gzip2deflate: gzip2deflate.c
-	$(HOSTCC) $(HOSTCFLAGS) -o gzip2deflate gzip2deflate.c
-
-zlibtest.xex: gzip2deflate zlibtest.c zlibtestdata.s romable_taimain.raw
-	gzip -9c < romable_taimain.raw | ./gzip2deflate > rom.dfl
-	$(CC) -t atari -m zlibtest.map -l zlibtest.lst -Wl -D__SYSTEM_CHECK__=1 --start-addr 0x7000 -o zlibtest.xex zlibtest.c zlibtestdata.s
-romable_taimain.xex: $(TAIMAIN_C_SRC) $(TAIMAIN_ASM_SRC) $(TAIMAIN_HDRS)
-	rm -f taimain.xex
-	$(MAKE) TAIMAIN_ADDR=0x3ff EXTRACFLAGS="-DCART_TARGET=1 --asm-define CART_TARGET=1"
-	mv taimain.xex romable_taimain.xex
-
-###
+damaged.txt: shipshape.pl LORCHA.DAT
+	$(PERLF) shipshape.pl DAMAGED.DAT > damaged.txt
 
+# This one build the sound code as a standalone xex.
 soundtest: sounds.c
 	$(CC) -DTESTXEX -t atari -o sounds.xex sounds.c
 	atari800 -nobasic sounds.xex
 
-# former textmode title screen, was generated by TITLE.LST. Replaced
-# by graphical title screen.
-#title.xex: TITLE.DAT
-#	$(PERL) title.pl TITLE.DAT > title.xex
-
-# old title
-#$(XEX): taimain.xex taifont.xex title.xex
-#	cat taifont.xex title.xex taimain.xex > $(XEX)
-