From a4712dc8a8b3e79eaf323537056fcdbd188feeb0 Mon Sep 17 00:00:00 2001
From: Michaelangel007 <michaelangel007@sharedcraft.com>
Date: Fri, 7 Jul 2017 17:01:02 -0700
Subject: [PATCH] Split demo from library -- can now directly include into your
 assembly

---
 Makefile               |  18 ++++++++++++++----
 demo_cc65.s            |  12 ++++++++++++
 demo_sans_zp.s         |  11 +++++++++++
 demo_with_sp.s         |  11 +++++++++++
 demo_with_zp.s         |  11 +++++++++++
 print_uint16_sans_zp   | Bin 86 -> 79 bytes
 print_uint16_sans_zp.s |  12 ++++--------
 print_uint16_with_sp   | Bin 90 -> 83 bytes
 print_uint16_with_sp.s |   6 ------
 print_uint16_with_zp   | Bin 74 -> 67 bytes
 print_uint16_with_zp.s |   6 ------
 11 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 demo_cc65.s
 create mode 100644 demo_sans_zp.s
 create mode 100644 demo_with_sp.s
 create mode 100644 demo_with_zp.s

diff --git a/Makefile b/Makefile
index 045913b..6788255 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,20 @@
-TARGETS=print_uint16_sans_zp print_uint16_with_zp print_uint16_with_sp
+TARGETS=print_uint16_sans_zp print_uint16_with_zp print_uint16_with_sp \
+        demo_sans_zp         demo_with_zp         demo_with_sp
 all: $(TARGETS)
 
 .PHONY: clean dump
 clean:
 	rm $(TARGETS)
 
+demo_sans_zp: demo_sans_zp.s
+	merlin32  demo_sans_zp.s
+
+demo_with_zp: demo_with_zp.s
+	merlin32  demo_with_zp.s
+
+demo_with_sp: demo_with_sp.s
+	merlin32  demo_with_sp.s
+
 print_uint16_sans_zp: print_uint16_sans_zp.s
 	merlin32          print_uint16_sans_zp.s
 
@@ -15,7 +25,7 @@ print_uint16_with_sp: print_uint16_with_sp.s
 	merlin32          print_uint16_with_sp.s
 
 dump: $(TARGETS)
-	hexdump8 print_uint16_sans_zp 800
-	hexdump8 print_uint16_with_zp 900
-	hexdump8 print_uint16_with_sp a00
+	hexdump8 demo_sans_zp 800
+	hexdump8 demo_with_zp 900
+	hexdump8 demo_with_sp a00
 
diff --git a/demo_cc65.s b/demo_cc65.s
new file mode 100644
index 0000000..4ce9ff2
--- /dev/null
+++ b/demo_cc65.s
@@ -0,0 +1,12 @@
+.feature labels_without_colons
+.export _printu 
+
+        .org $800
+
+        LDA #$12
+        LDX #$34
+        JMP _printu
+
+_printu
+.include "print_uint16_sans_zp.s"
+
diff --git a/demo_sans_zp.s b/demo_sans_zp.s
new file mode 100644
index 0000000..4adeda2
--- /dev/null
+++ b/demo_sans_zp.s
@@ -0,0 +1,11 @@
+; Demo
+
+        ORG $800
+
+        LDA #$12
+        LDX #$34
+        JMP PrintUint16
+
+; Merlin32 include
+        PUT print_uint16_sans_zp.s
+
diff --git a/demo_with_sp.s b/demo_with_sp.s
new file mode 100644
index 0000000..b9d6077
--- /dev/null
+++ b/demo_with_sp.s
@@ -0,0 +1,11 @@
+; Demo
+
+        ORG $A00 ; Intentionally different from sans-zero-page & with-zero-page
+
+        LDA #$12
+        LDX #$34
+        JMP PrintUint16
+
+; Merlin32 include
+        PUT print_uint16_with_sp.s
+
diff --git a/demo_with_zp.s b/demo_with_zp.s
new file mode 100644
index 0000000..1a467c1
--- /dev/null
+++ b/demo_with_zp.s
@@ -0,0 +1,11 @@
+; Demo
+
+        ORG $900 ; Intentionally different from sans-zero-page version for testing both
+
+        LDA #$12
+        LDX #$34
+        JMP PrintUint16
+
+; Merlin32 include
+        PUT print_uint16_with_zp.s
+
diff --git a/print_uint16_sans_zp b/print_uint16_sans_zp
index e559b162b61793ee05359b3535b880497233a856..a7d3c89a522a7317aca6174011a2837dacd66318 100644
GIT binary patch
literal 79
zcmV-V0I>g#PJp5Sj!S@!On{C}fT9ri4o-k7NTB_>PJek$f0<5y$k6m?%FyZ9paZ!|
lfFL-4h|u?n@D5-|Aba>ALV#!~56}V1=<x4M<^2Ev0001sCPe@M

literal 86
zcmV-c0IC0}5~4Ir2MCT;2%-RvQV5Py2#!<;q7e8FRR}6bp#8a32YFQonN<hK(DZ1^
s(COHq1G!NMAU_C*(D#b)4q!+id-xzp2xut}&;iQm@b66J{Qv*}0Hk9hRsaA1

diff --git a/print_uint16_sans_zp.s b/print_uint16_sans_zp.s
index 5ce54d4..e4b8db8 100644
--- a/print_uint16_sans_zp.s
+++ b/print_uint16_sans_zp.s
@@ -8,12 +8,6 @@
 PRHEXZ  = $FDE5
 SCRN2   = $F879
 
-        ORG $800
-
-        LDA #$12
-        LDX #$34
-        JMP PrintUint16
-
 ; Print unsigned 16-bit integer
 ; A=High byte
 ; X=Low  byte
@@ -82,6 +76,8 @@ _HaveLeadingDigit
         BEQ _PrintDone
         JMP PRHEXZ
 
-_bcd    ds  3   ; 6 chars for printing dec
-_temp   db  0
+_bcd    BRK ; 6 chars for printing dec
+        BRK
+        BRK 
+_temp   BRK
 
diff --git a/print_uint16_with_sp b/print_uint16_with_sp
index 5c37466acfb3eabd82462db42a228622c8dd40cf..8138fa8e8be2ccac9ee6c80e8c2a4a37cc057170 100644
GIT binary patch
delta 60
zcmazFR$sv2aVsh+YJtFyU45Djax9E?tc(h#4G`3E;nj`342%j64HNa`_`Di2H2E(u
McAWU|#OLW>0EV*{Q~&?~

delta 67
zcmWHJ(pxFC$i#=8YXO7Dt*EG|1p+^I^%-!<u`t@PGAh_`K~TqqS2y-DFe<onO;nfT
T3*^es<iEh!apJ=hpQnETyJQxq

diff --git a/print_uint16_with_sp.s b/print_uint16_with_sp.s
index e1c6890..14ab1c7 100644
--- a/print_uint16_with_sp.s
+++ b/print_uint16_with_sp.s
@@ -8,12 +8,6 @@
 PRHEXZ  = $FDE5
 SCRN2   = $F879
 
-        ORG $A00 ; Intentionally different from sans-zero-page & with-zero-page
-
-        LDA #$12
-        LDX #$34
-        JMP PrintUint16
-
 ; Print unsigned 16-bit integer
 ; A=High byte
 ; X=Low  byte
diff --git a/print_uint16_with_zp b/print_uint16_with_zp
index e4928cf4f153d92cee1d18af8b657e6761cdd6f8..80d5d3fdf9f8355bbaba2c49b4d56e4ce5f47fad 100644
GIT binary patch
delta 34
qcmeZrp2)5)W6;oX;d|Eyz61}2>K_VL4H=sJ7Z^{y`0(E6>0bczaS$~C

delta 41
xcmZ?vVqYn=$i#=8bAq~zIcLX(?_D4G5<C>De<(O|W@z$XU_ABW!+W2ne*r5b5kUX|

diff --git a/print_uint16_with_zp.s b/print_uint16_with_zp.s
index 27e2ca1..bf44132 100644
--- a/print_uint16_with_zp.s
+++ b/print_uint16_with_zp.s
@@ -12,12 +12,6 @@ SCRN2   = $F879
 _temp   = $fc
 _bcd    = $fd   ; NOTE: Optimized for ZP,X addressing in _DoubleDabble
 
-        ORG $900 ; Intentionally different from sans-zero-page version for testing both
-
-        LDA #$12
-        LDX #$34
-        JMP PrintUint16
-
 ; Print unsigned 16-bit integer
 ; A=High byte
 ; X=Low  byte