summaryrefslogtreecommitdiff
path: root/engine/printer
diff options
context:
space:
mode:
Diffstat (limited to 'engine/printer')
-rw-r--r--engine/printer/printer.asm4
-rw-r--r--engine/printer/printer_serial.asm6
2 files changed, 6 insertions, 4 deletions
diff --git a/engine/printer/printer.asm b/engine/printer/printer.asm
index a6e0f956..5b17c52f 100644
--- a/engine/printer/printer.asm
+++ b/engine/printer/printer.asm
@@ -443,9 +443,11 @@ CheckCancelPrint:
ret
.pressed_b
- ld a, [wc980]
+ ld a, [wUnusedGameboyPrinterSafeCancelFlag]
cp $0c
jr nz, .cancel
+
+; wait for printer activity to finish before canceling?
.loop
ld a, [wPrinterOpcode]
and a
diff --git a/engine/printer/printer_serial.asm b/engine/printer/printer_serial.asm
index 9d0bd907..f717ad38 100644
--- a/engine/printer/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
@@ -304,7 +304,7 @@ Printer_ResetData:
xor a
ld [wPrinterSendByteCounter], a
ld [wPrinterSendByteCounter + 1], a
- ld hl, wGameboyPrinterRAM
+ ld hl, wGameboyPrinter2bppSource
ld bc, wGameboyPrinter2bppSourceEnd - wGameboyPrinter2bppSource
call Printer_ByteFill
ret
@@ -435,10 +435,10 @@ PrinterDataPacket3:
PrinterDataPacket4:
db 4, 0, $00, 0
dw 4
-PrinterDataPacket5: ; unused
+PrinterDataPacket5: ; unreferenced
db 8, 0, $00, 0
dw 8
-PrinterDataPacket6: ; unused
+PrinterDataPacket6: ; unreferenced
db 15, 0, $00, 0
dw 15