From cf0a992d2520a84d1167f1f82aafe48a0cc784aa Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Fri, 1 Mar 2019 11:40:39 -0500
Subject: [PATCH] ootw: loader: move around to free up some room

---
 linker_scripts/apple2_1400.inc | 12 ++++++++++++
 ootw/Makefile                  |  4 ++--
 ootw/README                    |  9 +++------
 ootw/loader.s                  |  4 ++--
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 linker_scripts/apple2_1400.inc

diff --git a/linker_scripts/apple2_1400.inc b/linker_scripts/apple2_1400.inc
new file mode 100644
index 00000000..e9517c00
--- /dev/null
+++ b/linker_scripts/apple2_1400.inc
@@ -0,0 +1,12 @@
+MEMORY {
+       ZP: start = $00, size = $1A, type = rw;
+       RAM: start = $1400, size = $7E00, file = %O;
+}
+
+SEGMENTS {
+CODE: load = RAM, type = ro, align=$100;
+RODATA: load = RAM, type = ro;
+DATA: load = RAM, type = rw;
+BSS: load = RAM, type = bss, define = yes;
+ZEROPAGE: load = ZP, type = zp;
+}
diff --git a/ootw/Makefile b/ootw/Makefile
index 54750c8f..2217b953 100644
--- a/ootw/Makefile
+++ b/ootw/Makefile
@@ -9,7 +9,7 @@ all:	ootw.dsk
 
 ootw.dsk:	HELLO LOADER INTRO OOTW OOTW_C2 COMPRESS-TEST
 	$(DOS33) -y ootw.dsk SAVE A HELLO
-	$(DOS33) -y ootw.dsk BSAVE -a 0x1800 LOADER
+	$(DOS33) -y ootw.dsk BSAVE -a 0x1400 LOADER
 	$(DOS33) -y ootw.dsk BSAVE -a 0x2000 INTRO
 	$(DOS33) -y ootw.dsk BSAVE -a 0x2000 OOTW
 	$(DOS33) -y ootw.dsk BSAVE -a 0x2000 OOTW_C2
@@ -89,7 +89,7 @@ intro.o:	intro.s \
 ####
 
 LOADER:	loader.o
-	ld65 -o LOADER loader.o -C ../linker_scripts/apple2_1800.inc
+	ld65 -o LOADER loader.o -C ../linker_scripts/apple2_1400.inc
 
 loader.o:	loader.s
 	ca65 -o loader.o loader.s -l loader.lst
diff --git a/ootw/README b/ootw/README
index 3f28dfe5..ec5a4b31 100644
--- a/ootw/README
+++ b/ootw/README
@@ -25,12 +25,9 @@ Memory map:
 	02-03	
 	04-07	GR page0
 	08-0b	GR page1
-	0c-0f	offscreen data
+	0c-0f	offscreen data  ($c00 = disk load buffer)
 	10-13	offscreen data2
-	14-17   *****************free???
-	18-1c	loader
-	1d	loader buffer
-	1e-1f	*****************free???
-	20-bf	program/data (40k)
+	14-17	loader
+	18-bf	program/data (42k)
 	c0-cf	I/O
 	d0-ff	ROM
diff --git a/ootw/loader.s b/ootw/loader.s
index 7e6728b4..c685749b 100644
--- a/ootw/loader.s
+++ b/ootw/loader.s
@@ -27,8 +27,8 @@
 	tmptrk	=	$fe	; temporary copy of current track
 	phase	=	$ff	; current phase for /seek
 
-	dirbuf	=	$1d00
-			;$1e00	; note, don't put this immediately below
+	dirbuf	=	$c00
+				; note, don't put this immediately below
 				;   the value being read as destaddr-4
 				;   is temporarily overwritten during read
 				;   process