summaryrefslogtreecommitdiff
path: root/home
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-11 17:16:03 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-11 17:16:03 -0400
commitaf0119ca7e73c21205b5bb89bb9361db9aafa15f (patch)
tree4772eb5347f5f67d13ae874eced136aa6e987a31 /home
parent295604cbb51b0664c92f1a3a675ea7ffc3dc63ca (diff)
Name all printer functions
Diffstat (limited to 'home')
-rw-r--r--home/handshake.asm11
-rw-r--r--home/serial.asm2
2 files changed, 7 insertions, 6 deletions
diff --git a/home/handshake.asm b/home/handshake.asm
index 2f067e7f6..e4ca27c92 100644
--- a/home/handshake.asm
+++ b/home/handshake.asm
@@ -13,16 +13,17 @@ PrinterReceive:: ; 2057
AskSerial:: ; 2063
; send out a handshake while serial int is off
- ld a, [wc2d4]
+ ld a, [wPrinterConnectionOpen]
bit 0, a
ret z
- ld a, [wc2d5]
+; if we're still interpreting data, don't try to receive
+ ld a, [wPrinterOpcode]
and a
ret nz
; once every 6 frames
- ld hl, wca8a
+ ld hl, wHandshakeFrameDelay
inc [hl]
ld a, [hl]
cp 6
@@ -31,8 +32,8 @@ AskSerial:: ; 2063
xor a
ld [hl], a
- ld a, $c
- ld [wc2d5], a
+ ld a, 12
+ ld [wPrinterOpcode], a
; handshake
ld a, $88
diff --git a/home/serial.asm b/home/serial.asm
index 97e0c2442..7aab1616b 100644
--- a/home/serial.asm
+++ b/home/serial.asm
@@ -10,7 +10,7 @@ Serial:: ; 6ef
and a
jr nz, .mobile
- ld a, [wc2d4]
+ ld a, [wPrinterConnectionOpen]
bit 0, a
jr nz, .printer