From 5438c243e05b691448e3012fb834e1b43ea96c0f Mon Sep 17 00:00:00 2001
From: Roman Boykov <romychs@gmail.com>
Date: Sat, 24 Oct 2026 10:12:22 +0300
Subject: [PATCH] Rename gfx vars

---
 main.asm | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/main.asm b/main.asm
index 8eee578..fa05e1c 100644
--- a/main.asm
+++ b/main.asm
@@ -5025,17 +5025,16 @@ GET_XYC_CHK:
 PSETUP_XYC:
     CALL  GET_XYC_CHK
     CPL
-    LD    (PXOFSV), A
+    LD    (GFX_CUR_Y), A
     EX    DE, HL
-    LD    (GXDADDR1), HL
+    LD    (GFX_CUR_X), HL
     EX    DE, HL
     LD    (OPSTPOS), HL
 
 ; --------------------------------------------------
 PIX_ROW_ADDR:
-    DB    LD_HL_nn
-GXDADDR1:
-    DW    0x0000
+GFX_CUR_X EQU $+1
+    LD    HL, 0
     PUSH  HL
     LD    DE, -SCR_WIDTH
     ADD   HL, DE
@@ -5053,7 +5052,7 @@ GXDADDR1:
     ADD   HL, DE
     LD    C, A
     LD    (GXPXCLR), A
-    LD    A, (PXOFSV)
+    LD    A, (GFX_CUR_Y)
     LD    L, A
     LD    A, 0x1
 PIX_COLOR_MASK:
@@ -5151,11 +5150,12 @@ LINE:
     LD    A, 1
     CP    D
     JP    C, FCERR
-    LD    HL, (GXDADDR1)
+    LD    HL, (GFX_CUR_X)
     CALL  INVHL
     ADD   HL, DE
-    LD    (GXDADDR2 + 1), HL
-PXOFSV    EQU $+1
+    LD    (LINE_DX), HL
+
+GFX_CUR_Y EQU $+1
     LD    HL, 0xFFFF
     INC   HL
     ADD   HL, BC
@@ -5171,32 +5171,31 @@ DPL:
     CALL  GET_XYC                                   ; Get U, V, [, C]
     PUSH  HL
     EX    DE, HL
-    LD    (GXDADDR2 + 1), HL
+    LD    (LINE_DX), HL
     LD    H, B
     LD    L, C
 
 LINE_DRAW_INIT:
-    LD    (GXDADDR3 + 1), HL
-
-GXDADDR2:
+    LD    (LINE_DY), HL
+LINE_DX   EQU $+1
     LD    HL, 7
     LD    A, H
     OR    A
     CALL  M, INVHL
     LD    (LINE_DX_ABS), HL
     EX    DE, HL
-GXDADDR3:
+LINE_DY   EQU $+1
     LD    HL, 27
     LD    A, H
     OR    A
     CALL  P, INVHL
     PUSH  HL
     POP   BC
-    LD    (LINE_DY_SAVED + 1), HL
+    LD    (LINE_DY_SAVED), HL
     CALL  INVHL
     ADD   HL, DE
     PUSH  HL
-LINE_DY_SAVED:
+LINE_DY_SAVED  EQU $+1
     LD    HL, -27
     ADD   HL, DE
     PUSH  AF
@@ -5209,7 +5208,7 @@ LINE_DY_SAVED:
     LD    L, A
     POP   AF
     JP    C, LINE_LOOP_X
-    LD    A, (LINE_DY_SAVED + 1)
+    LD    A, (LINE_DY_SAVED)
     OR    A
     JP    NZ, LINE_LOOP_Y
     LD    A, (LINE_DX_ABS + 1)
@@ -5267,15 +5266,15 @@ LINE_AXIS_FLAG:
     LD    A, 0x0
     CP    1
     CALL  Z, LINE_PLOT_PIXEL
-    LD    HL, (GXDADDR1)
-    LD    A, (GXDADDR2 + 2)
+    LD    HL, (GFX_CUR_X)
+    LD    A, (LINE_DX + 1)                         ; +1!
     OR    A
     JP    M, LINE_X_PTR_STEP
     INC   HL
     INC   HL
 LINE_X_PTR_STEP:
     DEC   HL
-    LD    (GXDADDR1), HL
+    LD    (GFX_CUR_X), HL
     LD    A, (LINE_AXIS_FLAG + 1)
     CP    2
     LD    A, 1
@@ -5289,15 +5288,15 @@ LINE_STEP_Y:
     LD    A, (LINE_AXIS_FLAG + 1)
     CP    2
     CALL  Z, LINE_PLOT_PIXEL
-    LD    A, (GXDADDR3 + 2)
+    LD    A, (LINE_DY + 1)                         ; +1!
     OR    A
-    LD    A, (PXOFSV)
+    LD    A, (GFX_CUR_Y)
     JP    P, LINE_Y_DEC_OFFS
     INC   A
     INC   A
 LINE_Y_DEC_OFFS:
     DEC   A
-    LD    (PXOFSV), A
+    LD    (GFX_CUR_Y), A
     LD    A, (LINE_AXIS_FLAG + 1)
     CP    1
     LD    A, 2
@@ -7615,4 +7614,4 @@ MV_SAFE_CODE:
     JP    READY
 ; --------------------------------------------------
 ; Filler
-    .10   DB 0
\ No newline at end of file
+    .10   DB 0