From f3759a1f9b3de3d3f3577e0661eaa8cbd0254b77 Mon Sep 17 00:00:00 2001
From: Luxferre <lux@ferre>
Date: Tue, 6 Jan 2026 16:57:08 +0200
Subject: [PATCH] checked Apple II/IIe support

---
 README.md     |  2 +-
 c/Makefile    | 22 ++++++++++------------
 c/scoundrel.c |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index f7f61ba..5a82ed0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This is a collection of my own ports of the [Scoundrel](http://stfj.net/art/2011
 
 ## Ports included in this repo
 
-* [ANSI C89 port](c/scoundrel.c) - also compatible with CC65 (use the provided Makefile to build Scoundrel for Commodore 16/64/128/Plus-4/PET and Atari 400/800/XL; Apple II/IIe support is being debugged, JRE installation on the host system is required to build Apple disk images)
+* [ANSI C89 port](c/scoundrel.c) - also compatible with CC65 (use the provided Makefile to build Scoundrel for Commodore 16/64/128/Plus-4/PET, Atari 400/800/XL/XE and Apple II/IIe; a JRE installation on the host system is required to build Apple disk images)
 
 ## Ports NOT included in this repo for various reasons
 
diff --git a/c/Makefile b/c/Makefile
index f326821..3661771 100644
--- a/c/Makefile
+++ b/c/Makefile
@@ -13,24 +13,22 @@ bdir:
 	mkdir -p $(BUILDDIR)
 
 a2-build:
-	$(CCBUILD) -t apple2 -C apple2-system.cfg -o $(PROJNAME).apple2 $(CFILES)
+	$(CCBUILD) -t apple2 -C apple2-system.cfg -o $(BUILDDIR)/$(PROJNAME)-a2.bin $(CFILES)
 
 a2: a2-build bdir
-	cp $(PBTDIR)/apple2/tpl.dsk $(PROJNAME).dsk
-	java -jar $(PBTDIR)/apple2/ac.jar -p $(PROJNAME).dsk $(PROJNAME).system sys < $$(cl65 --print-target-path)/apple2/util/loader.system
-	java -jar $(PBTDIR)/apple2/ac.jar -as $(PROJNAME).dsk $(PROJNAME) bin < $(PROJNAME).apple2
-	mv $(PROJNAME).dsk $(BUILDDIR)/
-	rm $(PROJNAME).apple2
+	cp $(PBTDIR)/apple2/tpl.dsk $(PROJNAME)-a2.dsk
+	java -jar $(PBTDIR)/apple2/ac.jar -p $(PROJNAME)-a2.dsk $(PROJNAME).system sys < $$(cl65 --print-target-path)/apple2/util/loader.system
+	java -jar $(PBTDIR)/apple2/ac.jar -as $(PROJNAME)-a2.dsk $(PROJNAME) bin < $(BUILDDIR)/$(PROJNAME)-a2.bin
+	mv $(PROJNAME)-a2.dsk $(BUILDDIR)/
 
 a2e-build:
-	$(CCBUILD) -t apple2enh -C apple2enh-system.cfg -o $(PROJNAME).a2enh $(CFILES)
+	$(CCBUILD) -t apple2enh -C apple2enh-system.cfg -o $(BUILDDIR)/$(PROJNAME)-a2e.bin $(CFILES)
 
 a2e: a2e-build bdir
-	cp $(PBTDIR)/apple2/tpl.dsk $(PROJNAME)-enh.dsk
-	java -jar $(PBTDIR)/apple2/ac.jar -p $(PROJNAME)-enh.dsk $(PROJNAME).system sys < $$(cl65 --print-target-path)/apple2enh/util/loader.system
-	java -jar $(PBTDIR)/apple2/ac.jar -as $(PROJNAME)-enh.dsk $(PROJNAME) bin < $(PROJNAME).a2enh
-	mv $(PROJNAME)-enh.dsk $(BUILDDIR)/
-	rm $(PROJNAME).a2enh
+	cp $(PBTDIR)/apple2/tpl.dsk $(PROJNAME)-a2e.dsk
+	java -jar $(PBTDIR)/apple2/ac.jar -p $(PROJNAME)-a2e.dsk $(PROJNAME).system sys < $$(cl65 --print-target-path)/apple2enh/util/loader.system
+	java -jar $(PBTDIR)/apple2/ac.jar -as $(PROJNAME)-a2e.dsk $(PROJNAME) bin < $(BUILDDIR)/$(PROJNAME)-a2e.bin
+	mv $(PROJNAME)-a2e.dsk $(BUILDDIR)/
 
 atari8bit: bdir
 	$(CCBUILD) -t atari -o $(BUILDDIR)/$(PROJNAME)-atari.bin $(CFILES)
diff --git a/c/scoundrel.c b/c/scoundrel.c
index f397d97..95255a8 100644
--- a/c/scoundrel.c
+++ b/c/scoundrel.c
@@ -84,6 +84,7 @@ char get_choice() {
     default:
       res = CH_INVAL;
   }
+  printf("\n");
   return res;
 }
 
@@ -95,6 +96,7 @@ int confirm(char *prompt) {
   scanf(" %c", &c);
   if(c == 'y' || c == 'Y') d = 1;
   else d = 0;
+  printf("\n");
   return d;
 }