From 8d12f452a0b6c1a7f8c128b8a08a0b3e6471d2bc Mon Sep 17 00:00:00 2001
From: Curtis F Kaylor <revcurtis@gmail.com>
Date: Fri, 15 Nov 2019 00:05:53 -0500
Subject: [PATCH] Fixed header.?02 so they will compile and assemble

---
 include/header.a02 | 48 ++++++----------------------------------------
 include/header.h02 |  3 ---
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/include/header.a02 b/include/header.a02
index 101defd..a5b3edf 100644
--- a/include/header.a02
+++ b/include/header.a02
@@ -37,6 +37,10 @@ STKEHI  EQU $2B
 STKLO   EQU $2C     ;Stack Pointer
 STKHI   EQU $2D
 
+;Placeholders Labels for the Example Code Below
+POLKEY  EQU $FFFE   ;ROM Read Key Routine
+WSTART  EQU $FFFF   ;BASIC Warm Start Routine
+
         ORG $0200   ;Program Start Address
 
 START:  NOP         ;System specific initialization code
@@ -77,45 +81,5 @@ NEWLIN: RTS         ;Code to move Cursor to beginning of next line
 ;Print Character to Screen
 PUTCHR RTS         ;Code to write ASCII character to Screen
 
-;Clear the Screen
-CLRSCR: RTS         ;Code to Clear Screen
-
-;Move Cursor to Specified Coordinates
-SETPOS: RTS         ;Move Cursor to Column A, Row Y
-
-;Get Cursor Position
-GETPOS: RTS         ;Return Cursor Column in A, Row in Y
-
-;Get Screen Size
-GETSIZ: RTS         ;Return Screen Width in A, Height in Y
-
-;Note: The following two functions replicate calls available 
-;in the Apple-1 monitor and are included for test purposes
-;They will likely be removed before the final release
-
-;Print Byte as Two-Digit Hex Number to Console
-PRBYTE: PHA         ;Save Accumulater
-        LSR         ;Shift Hi Nybble to Low Nybble
-        LSR 
-        LSR 
-        LSR 
-        JSR PRHEX   ;  and Print it
-        PLA         ;Restore Accumulator 
-                    ;  and fall into PRHEX
-
-;Print Low Nybble as Hex Digit to Console
-PRHEX:  AND #$0F    ;Strip High Nybb
-        SED         ;Set Decimal Flag for 
-        CLC         ;  Addition Wizardry
-        ADC #$90    ;Convert to $90-$99,$00-$05
-        ADC #$40    ;Convert to $30-$39,$41-$46
-        CLD         ;Clear Decimal Flag
-        JMP PUTCHR  ;Print Hex Digit and Return   
-
-;Alternate Code for Systems with Interrupts that don't CLD
-PRHEX:  AND #$0F    ;Strip High Nybble
-        CMP #$0A    ;If Low Nybble >= 10
-        BCC PRHEXC  ;  
-        ADC #$06    ;  Convert ':' to 'A'...
-PRHEXC: ADC #$30    ;Convert to ASCII Character
-        JMP PUTCHR  ;Print Hex Digit and Return
+        INCLUDE "../include/prbyte.a02" ;PRBYTE and PRHEX routines
+ 
\ No newline at end of file
diff --git a/include/header.h02 b/include/header.h02
index 610bd31..34a6f0c 100644
--- a/include/header.h02
+++ b/include/header.h02
@@ -36,15 +36,12 @@ char rdseed;         //System Seed for Pseudo-Random Number Generator
 //System Subroutines
 void delchr(); //Delete previous character
 char getkey(); //Read ASCII character from Console
-char getpos(); //Get Cursor Position
-char getsiz(); //Get Screen Size
 void newlin(); //Advance cursor to beginning of next line
 char polkey(); //Poll Console for character
 char putchr(); //Print ASCII character to Console
 void prbyte(); //Print Accumulator as Hexadadecimal number
 void prhex();  //Print Low Nybble of Accumulator as Hex Digit
 char getchr(); //Wait for character from Console
-void setpos(); //Set Cursor Position
 
 //System Labels
 start:  //Start of Code