Apple-2-SW/a2d
1
0
Fork 0
mirror of https://github.com/mi57730/a2d.git synced 2025-02-20 02:29:11 +00:00
Code Issues Projects Releases Wiki Activity

Use common bell routine (from main/overlays)

Browse Source
This commit is contained in:
Joshua Bell 2019-01-20 11:41:49 -08:00
parent 5860cb493f
commit 525681931f
3 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desktop/desktop_aux.s
View File

@ -1582,8 +1582,6 @@ start: lda has_highlight
return #0
.endproc
rts ; unused
;;; ============================================================
;;; ICON_IN_RECT IMPL
@ -3297,8 +3295,6 @@ cancel_rect:
cancel_pos:
DEFINE_POINT 305,47
.word $BE,$10 ; ???
pos_prompt: DEFINE_POINT 75,29, pos_prompt
alert_action: .byte $00

24
desktop/desktop_main.s
View File

@ -12939,18 +12939,6 @@ do4: jsr bell
rts
.endproc
;;; ============================================================
.proc bell
sta ALTZPOFF
sta ROMIN2
jsr BELL1
sta ALTZPON
lda LCBANK1
lda LCBANK1
rts
.endproc
;;; ============================================================
;;; "DownLoad" dialog
@ -13772,6 +13760,18 @@ cursor_ip_flag: ; high bit set if IP, clear if pointer
;;;
;;; ============================================================
.assert * >= $A000, error, "Routine used by overlays in overlay zone"
.proc bell
sta ALTZPOFF
sta ROMIN2
jsr BELL1
sta ALTZPON
lda LCBANK1
lda LCBANK1
rts
.endproc
.proc set_cursor_watch
MGTK_RELAY_CALL MGTK::HideCursor
MGTK_RELAY_CALL MGTK::SetCursor, watch_cursor

14
desktop/ovl2.s
View File

@ -118,7 +118,7 @@ L0980: cmp #$2B
bne L09C2
jmp L090C
L098C: jsr L191B
L098C: jsr desktop_main::bell
axy_call desktop_main::draw_dialog_label, 6, desktop_aux::str_erasing_error
jmp L09B8
@ -131,7 +131,7 @@ L099B: pha
bne L09C2
jmp L090C
L09AC: jsr L191B
L09AC: jsr desktop_main::bell
axy_call desktop_main::draw_dialog_label, 6, desktop_aux::str_formatting_error
L09B8: jsr desktop_main::prompt_input_loop
bmi L09B8
@ -237,7 +237,7 @@ L0B12: cmp #$2B
bne L0B31
jmp L0AD1
L0B1E: jsr L191B
L0B1E: jsr desktop_main::bell
axy_call desktop_main::draw_dialog_label, 6, desktop_aux::str_erasing_error
L0B2A: jsr desktop_main::prompt_input_loop
bmi L0B2A
@ -1380,14 +1380,6 @@ loop: lda (ptr),y
rts
.endproc
L191B: sta ALTZPOFF
lda ROMIN2
jsr BELL1
sta ALTZPON
lda LCBANK1
lda LCBANK1
rts
L192E: sta read_block_params::unit_num
lda #0
sta read_block_params::block_num