From 81c65f7fffd6310a8100a132abd193b2cab480a8 Mon Sep 17 00:00:00 2001 From: Joshua Bell Date: Thu, 20 Dec 2018 09:12:19 -0800 Subject: [PATCH] Macros not math --- desktop/desktop_aux.s | 4 ++-- desktop/desktop_main.s | 8 ++++---- desktop/ovl4.s | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/desktop/desktop_aux.s b/desktop/desktop_aux.s index 14a6085..b51b92d 100644 --- a/desktop/desktop_aux.s +++ b/desktop/desktop_aux.s @@ -930,7 +930,7 @@ L9857: sub16 findwindow_params2::mousex, L9C8E, deltax lda deltax+1 bpl x_lo lda deltax - cmp #($100 - drag_delta) + cmp #AS_BYTE(-drag_delta) bcc is_drag jmp check_deltay x_lo: lda deltax @@ -942,7 +942,7 @@ check_deltay: lda deltay+1 bpl y_lo lda deltay - cmp #($100 - drag_delta) + cmp #AS_BYTE(-drag_delta) bcc is_drag jmp peek_loop y_lo: lda deltay diff --git a/desktop/desktop_main.s b/desktop/desktop_main.s index 90b5315..a7ee16a 100644 --- a/desktop/desktop_main.s +++ b/desktop/desktop_main.s @@ -8183,7 +8183,7 @@ exit: return #$FF ; not double-click ;; is -delta < x < 0 ? lda delta - cmp #($100 - double_click_deltax) + cmp #AS_BYTE(-double_click_deltax) bcs check_y fail: return #$FF @@ -8204,7 +8204,7 @@ check_y: ;; is -delta < y < 0 ? lda delta - cmp #($100 - double_click_deltay) + cmp #AS_BYTE(-double_click_deltay) bcs ok ;; is 0 < y < delta ? @@ -13257,7 +13257,7 @@ exit: return #$FF ; not double-click ;; is -delta < x < 0 ? lda delta - cmp #($100 - double_click_deltax) + cmp #AS_BYTE(-double_click_deltax) bcs check_y fail: return #$FF @@ -13278,7 +13278,7 @@ check_y: ;; is -delta < y < 0 ? lda delta - cmp #($100 - double_click_deltay) + cmp #AS_BYTE(-double_click_deltay) bcs ok ;; is 0 < y < delta ? diff --git a/desktop/ovl4.s b/desktop/ovl4.s index 44ee3be..f13efe1 100644 --- a/desktop/ovl4.s +++ b/desktop/ovl4.s @@ -1236,7 +1236,7 @@ exit: return #$FF ; not double-click ;; is -delta < x < 0 ? lda delta - cmp #($100 - double_click_deltax) + cmp #AS_BYTE(-double_click_deltax) bcs check_y fail: return #$FF @@ -1256,7 +1256,7 @@ check_y: ;; is -delta < y < 0 ? lda delta - cmp #($100 - double_click_deltay) + cmp #AS_BYTE(-double_click_deltay) bcs ok : lda delta