From 3fd36836d72056e597c45153ca8c22e790d891bc Mon Sep 17 00:00:00 2001
From: Jeremy Rand <jeremy@rand-family.com>
Date: Fri, 26 Aug 2016 01:07:57 -0400
Subject: [PATCH] Draw gems at every X pixel, not just every other one.

---
 a2bejwld/anim.c     |  2 +-
 a2bejwld/dbllores.s | 62 ++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/a2bejwld/anim.c b/a2bejwld/anim.c
index 65b2188..c0d1e35 100644
--- a/a2bejwld/anim.c
+++ b/a2bejwld/anim.c
@@ -35,7 +35,7 @@
 
 
 #define VERTICAL_PIXELS 48
-#define HORIZONTAL_PIXELS 32    // Half actually because we deal in double pixels in X for now
+#define HORIZONTAL_PIXELS 64
 
 #define VERTICAL_PIXELS_PER_SQUARE (VERTICAL_PIXELS / BOARD_SIZE)
 #define HORIZONTAL_PIXELS_PER_SQUARE (HORIZONTAL_PIXELS / BOARD_SIZE)
diff --git a/a2bejwld/dbllores.s b/a2bejwld/dbllores.s
index 5834678..d39c7d4 100644
--- a/a2bejwld/dbllores.s
+++ b/a2bejwld/dbllores.s
@@ -285,6 +285,15 @@ colorAux:   .BYTE $0
     lda gemAuxColours,Y
     sta gemAuxColour
 
+    stz isAux
+    lda xPos
+    lsr
+    sta xPos
+    bcs @L5
+    lda #1
+    sta isAux
+
+@L5:
 ; Get line addrs
     inx
     inx
@@ -313,8 +322,12 @@ colorAux:   .BYTE $0
 
     ; Draw the gem
     ldy #0
-    ldx #4
+    ldx #8
 @L1:
+
+    lda isAux
+    beq @L6
+
     sta HISCR
     lda (line1addr)
     and (gemmask),Y
@@ -346,6 +359,11 @@ colorAux:   .BYTE $0
     sta (line3addr)
     iny
 
+    stz isAux
+
+    bra @L7
+
+@L6:
     sta LOWSCR
     lda (line1addr)
     and (gemmask),Y
@@ -377,13 +395,16 @@ colorAux:   .BYTE $0
     sta (line3addr)
     iny
 
-    dex
-    beq @L2
-
     inc line1addr
     inc line2addr
     inc line3addr
 
+    inc isAux
+
+@L7:
+    dex
+    beq @L2
+
     jmp @L1
 @L2:
 
@@ -394,6 +415,7 @@ xPos:         .BYTE $0
 square:       .BYTE $0
 gemColour:    .BYTE $0
 gemAuxColour: .BYTE $0
+isAux:        .BYTE $0
 .endproc
 
 
@@ -405,6 +427,7 @@ gemAuxColour: .BYTE $0
     and #7
     asl
     asl
+    asl
     tax
     lda square
 ; Need to divide by 8 to get the y square
@@ -432,12 +455,30 @@ square:     .BYTE $0
 
 
 .proc _starGemAtXY
-    inx
-    inx
     stx xPos
+    lsr
     tax
+    bcc @L1
+    lda #$f0
+    bra @L2
+@L1:
+    lda #$0f
+@L2:
+    sta starVal
     inx
 
+    sta LOWSCR
+    lda xPos
+    lsr
+    tay
+    bcc @L3
+    sta HISCR
+    iny
+@L3:
+    iny
+    iny
+    sty xPos
+
 ; Get line addrs
     lda lineLoAddrs,X
     clc
@@ -445,9 +486,8 @@ square:     .BYTE $0
     sta line2addr
     lda lineHiAddrs,X
     sta line2addr+1
-    
-    sta HISCR
-    lda #$0f
+
+    lda starVal
     ora (line2addr)
     sta (line2addr)
     rts
@@ -456,6 +496,8 @@ square:     .BYTE $0
 
 xPos:       .BYTE $0
 square:     .BYTE $0
+starVal:    .BYTE $0
+
 .endproc
 
 
@@ -467,6 +509,7 @@ square:     .BYTE $0
     and #7
     asl
     asl
+    asl
     tax
     lda square
 ; Need to divide by 8 to get the y square
@@ -479,6 +522,7 @@ square:     .BYTE $0
     asl
     clc
     adc square
+    asl
     jmp _starGemAtXY
 
 ; Locals