From 4d4966d6b4de9321cb62c34ba13d660137e86d78 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Thu, 14 Sep 2017 21:13:54 -0700 Subject: [PATCH] Factor out common A2 defines --- desk.acc/calculator.s | 6 ++---- desk.acc/date.s | 10 +--------- desk.acc/puzzle.s | 5 ++--- inc/apple2.inc | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 inc/apple2.inc diff --git a/desk.acc/calculator.s b/desk.acc/calculator.s index 59b2cab..1f0a872 100644 --- a/desk.acc/calculator.s +++ b/desk.acc/calculator.s @@ -2,6 +2,7 @@ .org $800 .include "apple2.inc" + .include "../inc/apple2.inc" .include "../inc/prodos.inc" .include "../inc/auxmem.inc" .include "../inc/applesoft.inc" @@ -10,9 +11,6 @@ adjust_txtptr := $B1 -ROMIN2 := $C082 -COUT_HOOK := $36 - ;;; ================================================== ;;; Start of the code @@ -936,7 +934,7 @@ loop: lda routine,x lda input_state_params::modifiers bne bail lda input_state_params::key - cmp #$1B ; Escape? + cmp #KEY_ESCAPE bne trydel lda L0BC5 bne clear ; empty state? diff --git a/desk.acc/date.s b/desk.acc/date.s index 7f35aaa..7b8de2c 100644 --- a/desk.acc/date.s +++ b/desk.acc/date.s @@ -2,20 +2,12 @@ .setcpu "65C02" .include "apple2.inc" + .include "../inc/apple2.inc" .include "../inc/prodos.inc" .include "../inc/auxmem.inc" .include "a2d.inc" -ROMIN2 := $C082 - -KEY_ENTER := $0D -KEY_ESCAPE := $1B -KEY_LEFT := $08 -KEY_DOWN := $0A -KEY_UP := $0B -KEY_RIGHT := $15 - ;;; ================================================== jmp copy2aux diff --git a/desk.acc/puzzle.s b/desk.acc/puzzle.s index 99403bd..c56d9e3 100644 --- a/desk.acc/puzzle.s +++ b/desk.acc/puzzle.s @@ -2,13 +2,12 @@ .setcpu "65C02" .include "apple2.inc" + .include "../inc/apple2.inc" .include "../inc/prodos.inc" .include "../inc/auxmem.inc" .include "a2d.inc" -ROMIN2 := $C082 -SPKR := $C030 jmp copy2aux @@ -771,7 +770,7 @@ check_key: lda get_input_params::modifiers bne :+ lda get_input_params::key - cmp #$1B ; Escape + cmp #KEY_ESCAPE beq destroy : rts .endproc diff --git a/inc/apple2.inc b/inc/apple2.inc new file mode 100644 index 0000000..5ce66af --- /dev/null +++ b/inc/apple2.inc @@ -0,0 +1,21 @@ +;;; ------------------------------ +;;; More Apple II Symbols +;;; ------------------------------ + +;;; Zero Page + +COUT_HOOK := $36 + +;;; Soft Switches + +SPKR := $C030 +ROMIN2 := $C082 + +;;; Key Codes + +KEY_ENTER := $0D +KEY_ESCAPE := $1B +KEY_LEFT := $08 +KEY_DOWN := $0A +KEY_UP := $0B +KEY_RIGHT := $15