From a15ab2a7af8aaa58eb5f0a66c633f5b2a01571d3 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Tue, 13 Mar 2018 10:44:18 -0400
Subject: [PATCH] mode7: continue re-arranging memory map

---
 linker_scripts/apple2_4000.inc |   4 ++--
 mode7_demo/Makefile            |   8 ++++----
 mode7_demo/mode7_demo.s        |   4 ++++
 mode7_demo/out.krg             | Bin 0 -> 14336 bytes
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 mode7_demo/out.krg

diff --git a/linker_scripts/apple2_4000.inc b/linker_scripts/apple2_4000.inc
index 76422052..6239c452 100644
--- a/linker_scripts/apple2_4000.inc
+++ b/linker_scripts/apple2_4000.inc
@@ -1,10 +1,10 @@
 MEMORY {
        ZP: start = $00, size = $1A, type = rw;
-       RAM: start = $4000, size = $5800, file = %O;
+       RAM: start = $4000, size = $8000, file = %O;
 }
 
 SEGMENTS {
-CODE: load = RAM, type = ro;
+CODE: load = RAM, type = ro, align = $100;
 RODATA: load = RAM, type = ro;
 DATA: load = RAM, type = rw;
 BSS: load = RAM, type = bss, define = yes;
diff --git a/mode7_demo/Makefile b/mode7_demo/Makefile
index d269fdbb..11c3aed2 100644
--- a/mode7_demo/Makefile
+++ b/mode7_demo/Makefile
@@ -10,15 +10,15 @@ $(DOS33):
 	cd ../dos33fs-utils && make
 
 mode7_demo.dsk:	$(DOS33) MODE7_DEMO MODE7_DEMO_C
-	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x2000 MODE7_DEMO
-	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x1000 MODE7_DEMO_C
+	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x4000 MODE7_DEMO
+	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x2000 MODE7_DEMO_C
 
 
 
 ###
 
 MODE7_DEMO_C:	mode7_decompress.o
-	ld65 -o MODE7_DEMO_C mode7_decompress.o -C ../linker_scripts/apple2_1000.inc
+	ld65 -o MODE7_DEMO_C mode7_decompress.o -C ../linker_scripts/apple2_2000.inc
 
 mode7_decompress.o:	mode7_decompress.s MODE7_DEMO.lz4 \
 		../asm_routines/lz4_decode.s \
@@ -32,7 +32,7 @@ MODE7_DEMO.lz4:	MODE7_DEMO
 ###
 
 MODE7_DEMO:	mode7_demo.o
-	ld65 -o MODE7_DEMO mode7_demo.o -C ../linker_scripts/apple2_2000.inc
+	ld65 -o MODE7_DEMO mode7_demo.o -C ../linker_scripts/apple2_4000.inc
 
 mode7_demo.o:	mode7_demo.s mode7_demo_backgrounds.inc sprites.inc \
 		a2.scrolltext deater.scrolltext \
diff --git a/mode7_demo/mode7_demo.s b/mode7_demo/mode7_demo.s
index aac25942..8f7196ec 100644
--- a/mode7_demo/mode7_demo.s
+++ b/mode7_demo/mode7_demo.s
@@ -260,3 +260,7 @@ title_routine:
 .include "starfield_demo.s"
 .include "rasterbars.s"
 .include "credits.s"
+
+.align 256
+
+.incbin "out.krg"
diff --git a/mode7_demo/out.krg b/mode7_demo/out.krg
new file mode 100644
index 0000000000000000000000000000000000000000..e4a48ed04db4728345d3f9d34909d5fd5475aed1
GIT binary patch
literal 14336
zcmeI0y>1gh6otKZy#5JEXpm?k5#kl8s3Vagilta~fww@GLQCW#H3g+B9>AUb3RYf#
zp3Ymkh6kXgpb0b1e%9p5Lp)gwn4M83$LHL?nY)?wZh}G~2m&=z9Hhg>rQT_`JDrZ2
zDMpP(6h)25#-%<UjmG1#nkgpJX_6$<#Kxt5Ek-XL$dXH){eXGf|DaG941&VobTBy8
z)0Ic<cBC$LG;B16!>BQI<;iH2sEeKSr_+8vnf6_I@A|r@=cL!0=;_K`_bdHf_bdHf
z_bdHZ-S3TMl*K5f16gvZhhmh{fh@Vy$p^}Ml1o4GfwG?D(vN(gtS7njBOfU1NiO}!
z2g-VqOF!~~vYzD9uUIY@^$d!|Ku=d*3d53~L8%nz>B?Q}Nq^UR(qHCt<uacucdaM=
zSFL9`{x{9;Rosl#1l8v=lcT5DQrI%=@w<<g@uixe`rI{nsvmW`aeVY5K0H5fwGN-R
z4$jV+&4Xvn*2RYlInS49_{7SlC;aNoRm){kcmLI^lau}Zli5U#*=(|I{Qhm{<?GR>
zFSE~Ie>{2n{&Im?>!<n150W1aqJs;ab=dL=JN??2c-eQcPxd4GV%s17Haj|qKl$M{
zJ35H}L*s4dzmWH#-hTA6zkUl^CkCZ*SgBO!Z&~`AR@Vcw*425)50W1aqJyT+I&Aq&
zyN=g<lj7;OiJP?kEdBTAfBB7W@!Z36PR^cx{QmRt{OiyE^7HRi-+?@Iz@Pu+S9$9X
zk3uP|?>sJ+!K~%U!~X@r`*dk%9a1Nsw8JI-tMRN$qHTZZAp0a9E)hF%Ab!~460s8p
z;)fkB5j%09?fgH@`8d+!`1p9;s7lPoypH^(ESc)7;57XLD6tUI59lEFIafsLHaq?{
zJ35Fz`QbJ@I*5O!_&dS3#Fif&{4MoWvO7y4IXbAE4AcB$*7~;dzqhx$yYpy!+oSJ;
z|2z19&%u4?zh0}UpK7&Q3Dy6pD;4es=x`h2w`uY9YPeNYuLkSJJ$09@*D9gL?Ru>W
zX01yeGrz0@2hIA#u?|~4X*apfYjW~aZ<*cnUuI`rpy{vkn|zgcb6>0vTqWMD_mKL3
zJKlEwm%kO~N9BIDsrN6x{@dp^fBk;_{q4_xe(q_0r@jNS1OEKWj(F}nke?3N&cD}v
K2Yd(e+ku~5y-3Oc

literal 0
HcmV?d00001