From c50d9ed591a58775c0a1b63c6548b52333073a36 Mon Sep 17 00:00:00 2001
From: Roman Boykov <romychs@gmail.com>
Date: Fri, 23 Oct 2026 23:42:17 +0300
Subject: [PATCH] Errors fixed to compile byte to byte

---
 basic.asm |  5 ----
 main.asm  | 70 +++++++++++++++++++++++++++----------------------------
 2 files changed, 35 insertions(+), 40 deletions(-)

diff --git a/basic.asm b/basic.asm
index 7a4aafe..4889b5d 100644
--- a/basic.asm
+++ b/basic.asm
@@ -32,8 +32,6 @@
 ; --------------------------------------------------
     OUTPUT  "bas-24.bru",a
 
-    ORG     0x0000
-
 START:
 
     INCLUDE "main.asm"
@@ -44,6 +42,3 @@ START:
     INCLUDE "safe.inc"
 
 ; --------------------------------------------------
-
-;    Include this for test offsets of uninitialized variables
-;    INCLUDE "chk_offs.inc"
diff --git a/main.asm b/main.asm
index 1b2c0d6..956d299 100644
--- a/main.asm
+++ b/main.asm
@@ -4,7 +4,7 @@
 ; Implementation code 1
 ; Disassembled by Romychs @ 2026-10-23
 ; ==================================================
-
+    ORG   0x0000
 
     JP    INIT                                      ; Initialize interpreter
 
@@ -94,7 +94,6 @@ FSIGN:
 GETNXW:
     EX    (SP), HL
     LD    (NX_ADDR), HL
-;LAB_ram_0034:
     POP   HL
     JP    NWCONT
 
@@ -265,13 +264,13 @@ ERRTAB:
     DB    '17'C, '18'C
 
 MSGERR:
-    DB    ' o{ibka', 0
+    DB    " o{ibka", 0
 INTXT:
-    DB    ' w ', 0
+    DB    " w ", 0
 BRKTXT:
-    DB    '\r\nstop', 0
+    DB    "\r\nstop", 0
 MSG_OK:
-    DB    'OK:', 0
+    DB    "OK:", 0
 
 ; ==================================================
 ; General storage management routines
@@ -2288,11 +2287,10 @@ GETCPOS:
     LD    HL, OUTDEV
     LD    A, (TXTWIDTH)                             ; = 64
     DEC   A
-    INC   HL
-    DEC   HL
-    DB    LD_L_n
-TTYPOS:
-    DB    0
+    INC   (HL)
+    DEC   (HL)
+TTYPOS    EQU $+1
+    LD    L, 0
     JP    NZ, GPLPT
     CALL  MON_GETCUR                                ; result: H-row, L-col
     LD    A, 63
@@ -2955,7 +2953,7 @@ BUFMIN:
     DB    ','
     ; [BUFLEN=37] but 130 bytes can be used for string input
 BUF:
-    DB    '  BASIC *ORION*\r\nVERSION 2.4 /1993\r\n', 0
+    DB    "  BASIC *ORION*\r\nVERSION 2.4 /1993\r\n", 0
 
 ; --------------------------------------------------
 ; Code to move to unswitcheable RAM area
@@ -3289,7 +3287,7 @@ FADD1:
     CALL  FADDA
     JP    NC, ROUND
     INC   HL
-    INC   HL
+    INC   (HL)
     JP    Z, OVERR
     LD    L, 1
     CALL  SHRADD
@@ -3703,7 +3701,7 @@ FDIV2:
     JP    NZ, FDIV1
     PUSH  HL
     LD    HL, FAC
-    DEC   HL
+    DEC   (HL)
     POP   HL
     JP    NZ, FDIV1
     JP    OVERR
@@ -3758,7 +3756,7 @@ MUL10:
     LD    B, A
     CALL  FADD
     LD    HL, FAC
-    INC   HL
+    INC   (HL)
     RET   NZ
     JP    OVERR
 
@@ -3797,7 +3795,7 @@ SGNFN:
 ; --------------------------------------------------
 FLOAT:
     LD    B, 0x88
-    LD    DE, 0x0
+    LD    DE, 0
 
 ; --------------------------------------------------
 ; Build float from signed int in B, A, D, E
@@ -3806,9 +3804,9 @@ FLOATR:
     LD    HL, FAC
     LD    C, A
     LD    (HL), B
-    LD    B, 0x0
+    LD    B, 0
     INC   HL
-    LD    HL, 0x80
+    LD    (HL), 0x80
     RLA
     JP    FADFLT
 
@@ -4053,7 +4051,7 @@ INTFN:
     RET   NC
     LD    A, (HL)
     CALL  QINT
-    LD    HL, 152
+    LD    (HL), 152
     LD    A, E
     PUSH  AF
     LD    A, C
@@ -4253,10 +4251,10 @@ FOUT:
     RST   FSIGN
     LD    (HL), ASCII_SP
     JP    P, FOUT1
-    LD    HL, '-'
+    LD    (HL), '-'
 FOUT1:
     INC   HL
-    LD    HL, '0'
+    LD    (HL), '0'
     JP    Z, FOUT19
     PUSH  HL
     CALL  M, NEG
@@ -4279,7 +4277,7 @@ FOUT9:
     PUSH  AF
     CALL  FOUTCB
 FOUT5:
-    CALL 0xFADD
+    CALL  FADDH
     INC   A
     CALL  QINT
     CALL  MOVFR
@@ -4299,7 +4297,7 @@ FOUT6:
     LD    DE, FOUTBL
 FOUT8:
     DEC   B
-    LD    HL, '.'
+    LD    (HL), '.'
     CALL  Z, INXHRT
     PUSH  BC
     PUSH  HL
@@ -4349,11 +4347,11 @@ FOUT11:
 FOUT12:
     POP   AF
     JP    Z, FOUT17
-    LD    HL, 'E'
+    LD    (HL), 'E'
     INC   HL
-    LD    HL, '+'
+    LD    (HL), '+'
     JP    P, FOUT14
-    LD    HL, '-'
+    LD    (HL), '-'
     CPL
     INC   A
 FOUT14:
@@ -4558,10 +4556,10 @@ RND1:
     LD    A, E
     LD    E, C
     LD    C, A
-    LD    HL, 0x80
+    LD    (HL), 0x80
     DEC   HL
     LD    B, (HL)
-    LD    HL, 0x80
+    LD    (HL), 0x80
     CALL  NORMAL
     LD    HL, RNDX
     JP    MOVMF
@@ -4597,7 +4595,7 @@ SINFN:
     RST   FSIGN
     SCF
     JP    P, SIN1
-    CALL 0xFADD
+    CALL  FADDH
     RST   FSIGN
     OR    A
 SIN1:
@@ -4832,18 +4830,18 @@ OCH_OUT_ADR:
     LD    A, C
     CP    ASCII_SP
     RET   C
-    INC   HL
+    INC   (HL)
     JP    Z, LAB_ram_17a4
     LD    A, (TXTWIDTH)                             ; = 64
     DEC   A
     CP    (HL)
     CALL  C, CRDO
-    INC   HL
+    INC   (HL)
 LAB_ram_17a2:
     OR    (HL)
     RET   Z
 LAB_ram_17a4:
-    DEC   HL
+    DEC   (HL)
     RET
 OUSYMSP:
     CALL  MON_GETCUR
@@ -5760,7 +5758,7 @@ APFLAG:
     JP    Z, ISESC1
     CALL  ISCTLKEY
     JP    Z, DOCTLKEY
-    LD    HL, 0
+    LD    (HL), 0
     POP   BC
     POP   HL
     RET
@@ -6710,7 +6708,7 @@ SUB_ram_2165:
 AUTOINC_ADR EQU $+1
 
     LD    HL, SUB_ram_215f
-    DB    LD_HL_nn
+    ;DB    LD_HL_nn
 
     LD    (MAIN + 1), HL
     CALL  FNDLIN
@@ -6721,7 +6719,7 @@ AUTOINC_ADR EQU $+1
     INC   HL
     LD    (HL), D
     INC   HL
-    LD    HL, 0x0
+    LD    (HL), 0x0
     POP   HL
     JP    INLED
 
@@ -7616,3 +7614,5 @@ MV_SAFE_CODE:
     CALL  SCRTCH
     JP    READY
 ; --------------------------------------------------
+; Filler
+    .10   DB 0
\ No newline at end of file