Factor out common A2 defines

This commit is contained in:
Joshua Bell 2017-09-14 21:13:54 -07:00
parent 391ee78bdd
commit 4d4966d6b4
4 changed files with 26 additions and 16 deletions

View File

@ -2,6 +2,7 @@
.org $800 .org $800
.include "apple2.inc" .include "apple2.inc"
.include "../inc/apple2.inc"
.include "../inc/prodos.inc" .include "../inc/prodos.inc"
.include "../inc/auxmem.inc" .include "../inc/auxmem.inc"
.include "../inc/applesoft.inc" .include "../inc/applesoft.inc"
@ -10,9 +11,6 @@
adjust_txtptr := $B1 adjust_txtptr := $B1
ROMIN2 := $C082
COUT_HOOK := $36
;;; ================================================== ;;; ==================================================
;;; Start of the code ;;; Start of the code
@ -936,7 +934,7 @@ loop: lda routine,x
lda input_state_params::modifiers lda input_state_params::modifiers
bne bail bne bail
lda input_state_params::key lda input_state_params::key
cmp #$1B ; Escape? cmp #KEY_ESCAPE
bne trydel bne trydel
lda L0BC5 lda L0BC5
bne clear ; empty state? bne clear ; empty state?

View File

@ -2,20 +2,12 @@
.setcpu "65C02" .setcpu "65C02"
.include "apple2.inc" .include "apple2.inc"
.include "../inc/apple2.inc"
.include "../inc/prodos.inc" .include "../inc/prodos.inc"
.include "../inc/auxmem.inc" .include "../inc/auxmem.inc"
.include "a2d.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 jmp copy2aux

View File

@ -2,13 +2,12 @@
.setcpu "65C02" .setcpu "65C02"
.include "apple2.inc" .include "apple2.inc"
.include "../inc/apple2.inc"
.include "../inc/prodos.inc" .include "../inc/prodos.inc"
.include "../inc/auxmem.inc" .include "../inc/auxmem.inc"
.include "a2d.inc" .include "a2d.inc"
ROMIN2 := $C082
SPKR := $C030
jmp copy2aux jmp copy2aux
@ -771,7 +770,7 @@ check_key:
lda get_input_params::modifiers lda get_input_params::modifiers
bne :+ bne :+
lda get_input_params::key lda get_input_params::key
cmp #$1B ; Escape cmp #KEY_ESCAPE
beq destroy beq destroy
: rts : rts
.endproc .endproc

21
inc/apple2.inc Normal file
View File

@ -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