From 78498cf655169c3fc95f1dba31c07acaed9d11a4 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Fri, 23 Nov 2018 13:38:59 -0800 Subject: [PATCH] diasm - burn down raw references --- desktop/desktop_aux.s | 13 +++++-------- desktop/desktop_main.s | 24 ++++++++---------------- desktop/ovl2.s | 28 ++++++++++++++-------------- 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/desktop/desktop_aux.s b/desktop/desktop_aux.s index d2f743e..d9836e4 100644 --- a/desktop/desktop_aux.s +++ b/desktop/desktop_aux.s @@ -2274,14 +2274,11 @@ LA538: add16 poly::vertices,x, LA56B, poly::vertices,x bne LA538 rts -LA567: .byte 0 -LA568: .byte 0 -LA569: .byte 0 -LA56A: .byte 0 -LA56B: .byte 0 -LA56C: .byte 0 -LA56D: .byte 0 -LA56E: .byte 0 +LA567: .word 0 +LA569: .word 0 +LA56B: .word 0 +LA56D: .word 0 + LA56F: pla tay jsr push_zp_addrs diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s index 824d808..2071415 100644 --- a/desktop/desktop_main.s +++ b/desktop/desktop_main.s @@ -305,8 +305,7 @@ L4227: lda #$00 jmp reset_grafport3 L4241: .byte 0 -L4242: .byte 0 -L4243: .byte 0 +L4242: .word 0 .endproc ;;; ============================================================ @@ -1928,8 +1927,7 @@ fail: rts .proc cmd_new_folder_impl L4F67: .byte $00 -L4F68: .byte $00 -L4F69: .byte $00 +L4F68: .word 0 ;; access = destroy/rename/write/read DEFINE_CREATE_PARAMS create_params, path_buffer, ACCESS_DEFAULT, FT_DIRECTORY,, ST_LINKED_DIRECTORY @@ -4048,10 +4046,8 @@ L6161: txa L6196: rts -L6197: .byte 0 -L6198: .byte 0 -L6199: .byte 0 -L619A: .byte 0 +L6197: .word 0 +L6199: .word 0 .endproc @@ -4429,8 +4425,7 @@ L65EE: sta updatethumb_thumbpos rts L6600: .word 0 -L6602: .byte 0 -L6603: .byte 0 +L6602: .word 0 .endproc ;;; ============================================================ @@ -4470,8 +4465,7 @@ L668D: sta updatethumb_thumbpos rts L669F: .byte 0 -L66A0: .byte 0 -L66A1: .byte 0 +L66A0: .word 0 .endproc ;;; ============================================================ @@ -5921,8 +5915,7 @@ L7429: lda LE1F1 L7445: .byte 0 L7446: .byte 0 L7447: .word 0 -L7449: .byte 0 -L744A: .byte 0 +L7449: .word 0 .endproc ;;; ============================================================ @@ -6150,8 +6143,7 @@ L762C: .word 0 L762E: .byte $05 L762F: .byte $00 L7630: .word 0 -L7632: .byte $00 -L7633: .byte $00 +L7632: .word 0 L7634: .byte $00 .proc L7635 diff --git a/desktop/ovl2.s b/desktop/ovl2.s index 8700cc9..fe79d18 100644 --- a/desktop/ovl2.s +++ b/desktop/ovl2.s @@ -17,8 +17,8 @@ L080C: lda #$00 jsr desktop_main::LB509 lda winfo_alert_dialog jsr desktop_main::set_port_from_window_id - addr_call desktop_main::draw_dialog_title, $B245 - axy_call desktop_main::draw_dialog_label, $01, $B257 + addr_call desktop_main::draw_dialog_title, desktop_aux::LB245 + axy_call desktop_main::draw_dialog_label, $01, desktop_aux::LB257 jsr L0D31 lda #$FF sta LD887 @@ -50,7 +50,7 @@ L085F: bit LD887 lda #$00 sta use_ovl2_handler_flag jsr desktop_main::clear_path_buf2 - axy_call desktop_main::draw_dialog_label, $03, $B28D + axy_call desktop_main::draw_dialog_label, $03, desktop_aux::LB28D L08A7: jsr desktop_main::prompt_input_loop bmi L08A7 beq L08B7 @@ -74,7 +74,7 @@ L08B7: lda path_buf1 sta L09D7 lda #$00 sta has_input_field_flag - axy_call desktop_main::draw_dialog_label, $03, $B2AF + axy_call desktop_main::draw_dialog_label, $03, desktop_aux::LB2AF lda L09D7 jsr L1A2D addr_call desktop_main::draw_text1, file_count @@ -87,7 +87,7 @@ L090C: lda winfo_alert_dialog jsr desktop_main::set_port_from_window_id MGTK_RELAY_CALL MGTK::SetPenMode, pencopy MGTK_RELAY_CALL MGTK::PaintRect, $AE6E - ldax #$B2C6 + ldax #desktop_aux::LB2C6 ldy #$01 jsr desktop_main::draw_dialog_label lda L09D7 @@ -102,7 +102,7 @@ L0942: lda winfo_alert_dialog jsr desktop_main::set_port_from_window_id MGTK_RELAY_CALL MGTK::SetPenMode, pencopy MGTK_RELAY_CALL MGTK::PaintRect, $AE6E - axy_call desktop_main::draw_dialog_label, $01, $B373 + axy_call desktop_main::draw_dialog_label, $01, desktop_aux::LB373 addr_call L1900, path_buf1 ldx #$43 ldy #$D4 @@ -122,7 +122,7 @@ L0980: cmp #$2B jmp L090C L098C: jsr L191B - ldax #$B388 + ldax #desktop_aux::LB388 ldy #$06 jsr desktop_main::draw_dialog_label jmp L09B8 @@ -137,7 +137,7 @@ L099B: pha jmp L090C L09AC: jsr L191B - axy_call desktop_main::draw_dialog_label, $06, $B2DE + axy_call desktop_main::draw_dialog_label, $06, desktop_aux::LB2DE L09B8: jsr desktop_main::prompt_input_loop bmi L09B8 bne L09C2 @@ -158,8 +158,8 @@ L09D9: lda #$00 jsr desktop_main::LB509 lda winfo_alert_dialog jsr desktop_main::set_port_from_window_id - addr_call desktop_main::draw_dialog_title, $B319 - ldax #$B32A + addr_call desktop_main::draw_dialog_title, desktop_aux::LB319 + ldax #desktop_aux::LB32A ldy #$01 jsr desktop_main::draw_dialog_label jsr L0D31 @@ -188,7 +188,7 @@ L0A18: bit LD887 lda #$00 sta use_ovl2_handler_flag jsr desktop_main::clear_path_buf2 - axy_call desktop_main::draw_dialog_label, $03, $B28D + axy_call desktop_main::draw_dialog_label, $03, desktop_aux::LB28D L0A6A: jsr desktop_main::prompt_input_loop bmi L0A6A beq L0A7A @@ -212,7 +212,7 @@ L0A7A: lda path_buf1 lda DEVLST,x sta L0B47 sta L0B46 - axy_call desktop_main::draw_dialog_label, $03, $B35D + axy_call desktop_main::draw_dialog_label, $03, desktop_aux::LB35D lda L0B46 and #$F0 jsr L1A2D @@ -226,7 +226,7 @@ L0AD1: lda winfo_alert_dialog jsr desktop_main::set_port_from_window_id MGTK_RELAY_CALL MGTK::SetPenMode, pencopy MGTK_RELAY_CALL MGTK::PaintRect, $AE6E - axy_call desktop_main::draw_dialog_label, $01, $B373 + axy_call desktop_main::draw_dialog_label, $01, desktop_aux::LB373 addr_call L1900, path_buf1 jsr desktop_main::set_cursor_watch ldx #$43 @@ -247,7 +247,7 @@ L0B12: cmp #$2B jmp L0AD1 L0B1E: jsr L191B - axy_call desktop_main::draw_dialog_label, $06, $B388 + axy_call desktop_main::draw_dialog_label, $06, desktop_aux::LB388 L0B2A: jsr desktop_main::prompt_input_loop bmi L0B2A beq L0AD1