Working in unumber/snumber. Updated test files.

src/test/ref/complex/tetris/tetris.asm

@@ -388,6 +388,7 @@ render_bcd: {
 }
 // Render the next tetromino in the "next" area
 render_next: {
+    // Find the screen area
     .const next_area_offset = $28*$c+$18+4
     .label next_piece_gfx = 5
     .label next_piece_char = $a

src/test/ref/examples/fire/fire.asm

@@ -182,7 +182,7 @@ makecharset: {
     .label ii = $a
     .label i = 9
     .label c = 8
-    .label _22 = 2
+    .label _26 = 2
     lda #<CHARSET
     sta font
     lda #>CHARSET
@@ -272,15 +272,15 @@ makecharset: {
     inc _19+1
   !:
     clc
-    lda _22
+    lda _26
     adc #<CHARSET+1*8
-    sta _22
-    lda _22+1
+    sta _26
+    lda _26+1
     adc #>CHARSET+1*8
-    sta _22+1
+    sta _26+1
     tya
     ldy #0
-    sta (_22),y
+    sta (_26),y
     inc i
     lda i
     cmp #8

src/test/ref/test-scroll-up.asm

@@ -14,8 +14,8 @@ scrollup3: {
     .label l2_1 = 4
     .label line = 2
     .label l2_2 = 4
-    .label _4 = 7
-    .label _5 = 9
+    .label _5 = 7
+    .label _6 = 9
     .label l2_4 = 4
     lda #0
     sta l2
@@ -30,20 +30,20 @@ scrollup3: {
     lda l2_2
     clc
     adc #<screen+$28
-    sta _4
+    sta _5
     lda l2_2+1
     adc #>screen+$28
-    sta _4+1
+    sta _5+1
     lda l2_2
     clc
     adc #<screen
-    sta _5
+    sta _6
     lda l2_2+1
     adc #>screen
-    sta _5+1
+    sta _6+1
     ldy #0
-    lda (_4),y
-    sta (_5),y
+    lda (_5),y
+    sta (_6),y
     inc l2_1
     bne !+
     inc l2_1+1
@@ -109,8 +109,8 @@ scrollup1: {
     .label _0 = 4
     .label _2 = 7
     .label line = 2
-    .label _6 = 7
-    .label _7 = 4
+    .label _7 = 7
+    .label _8 = 4
     lda #0
     sta line
     sta line+1
@@ -132,22 +132,22 @@ scrollup1: {
     adc line+1
     sta _2+1
     clc
-    lda _6
-    adc #<screen+$28
-    sta _6
-    lda _6+1
-    adc #>screen+$28
-    sta _6+1
-    clc
     lda _7
-    adc #<screen
+    adc #<screen+$28
     sta _7
     lda _7+1
-    adc #>screen
+    adc #>screen+$28
     sta _7+1
+    clc
+    lda _8
+    adc #<screen
+    sta _8
+    lda _8+1
+    adc #>screen
+    sta _8+1
     ldy #0
-    lda (_6),y
-    sta (_7),y
+    lda (_7),y
+    sta (_8),y
     inx
     cpx #$28
     bcc b2

src/test/ref/test-word-size-arrays.asm

@@ -7,9 +7,9 @@ main: {
     .label _2 = 6
     .label _6 = 4
     .label line = 2
-    .label _8 = 6
-    .label _9 = 4
+    .label _9 = 6
     .label _10 = 4
+    .label _11 = 4
     lda #0
     sta line
     sta line+1
@@ -31,22 +31,22 @@ main: {
     adc line+1
     sta _2+1
     clc
-    lda _8
-    adc #<screen+$28
-    sta _8
-    lda _8+1
-    adc #>screen+$28
-    sta _8+1
-    clc
     lda _9
-    adc #<screen
+    adc #<screen+$28
     sta _9
     lda _9+1
-    adc #>screen
+    adc #>screen+$28
     sta _9+1
+    clc
+    lda _10
+    adc #<screen
+    sta _10
+    lda _10+1
+    adc #>screen
+    sta _10+1
     ldy #0
-    lda (_8),y
-    sta (_9),y
+    lda (_9),y
+    sta (_10),y
     inx
     cpx #$28
     bcc b2
@@ -76,15 +76,15 @@ main: {
     adc line+1
     sta _6+1
     clc
-    lda _10
+    lda _11
     adc #<screen
-    sta _10
-    lda _10+1
+    sta _11
+    lda _11+1
     adc #>screen
-    sta _10+1
+    sta _11+1
     lda #' '
     ldy #0
-    sta (_10),y
+    sta (_11),y
     inx
     cpx #$28
     bcc b4