Fix transposed argument in macro definition; dynamic tile + sprite now working

macros/CORE.MACS.S

@@ -339,67 +339,3 @@ transparent
                 sta:  ]3+1,y
 next
                 eom
-
-; Masked renderer for a dynamic tile with sprite data overlaid.
-;
-; ]1 : sprite plane offset
-; ]2 : code field offset
-CopyDynSpriteWord MAC
-
-; Need to fill in the first 10 bytes of the JMP handler with the following code sequence where
-; the data and mask from from the sprite plane
-;
-;            lda  $00,x
-;            and  #MASK
-;            ora  #DATA
-;            bra  *+15
-;
-; If MASK == 0, then we can do a PEA.  If MASK == $FFFF, then fall back to the simple Dynamic Tile
-; code.
-                ldal  spritemask+]1,x            ; load the mask value
-                bne   mixed                      ; a non-zero value may be mixed
-
-; This is a solid word
-                lda   #$00F4          ; PEA instruction
-                sta:  ]2,y
-                ldal  spritedata+]1,x ; load the sprite data
-                sta:  ]2+1,y          ; PEA operand
-                bra   next
-
-mixed           cmp   #$FFFF          ; All 1's in the mask is a fully transparent sprite word
-                beq   transparent
-
-                lda   _JTBL_CACHE     ; Get the offset to the exception handler for this column
-                adc   #{]1&$F000}     ; adjust for the current row offset
-                sta:  ]1+1,y
-
-                tay                   ; This becomes the new address that we use to patch in
-                ldx   _SPR_X_REG      ; Offset into the sprite plane
-
-                lda   _OP_CACHE       ; Get the LDA dp,x instruction for this column
-                sta:  $0000,y
-
-                lda   #$0029          ; AND #SPRITE_MASK
-                sta:  $0002,y
-                ldal  spritemask+]1,x 
-                sta:  $0003,y
-
-                lda   #$0009          ; ORA #SPRITE_DATA
-                sta:  $0005,y
-                ldal  spritedata+]1,x
-                sta:  $0006,y
-
-                lda   #$0D80          ; branch to the prologue (BRA *+15)
-                sta:  $0008,y
-
-                ldy   _Y_REG          ; restore original y-register value and move on
-                bra   next
-
-; This is a transparent word, so just show the dynamic data
-transparent
-                lda   #$4800          ; Put the PHA in the third byte
-                sta:  ]2+1,y
-                lda   _OP_CACHE       ; Store the LDA dp,x instruction with operand
-                sta:  ]2,y
-next
-                eom

src/blitter/Tiles10001.s

@@ -19,6 +19,8 @@ _TBDynamicSpriteTile_00
                  xba
                  sta             _OP_CACHE            ; This is the 2-byte opcode for to load the data
 
+                 ldx             _SPR_X_REG
+
                  CopyDynSpriteWord  {0*SPRITE_PLANE_SPAN};$0003
                  CopyDynSpriteWord  {1*SPRITE_PLANE_SPAN};$1003
                  CopyDynSpriteWord  {2*SPRITE_PLANE_SPAN};$2003
@@ -29,10 +31,8 @@ _TBDynamicSpriteTile_00
                  CopyDynSpriteWord  {7*SPRITE_PLANE_SPAN};$7003
 
                  ldx             _X_REG
-                 inx
-                 inx
                  clc
-                 ldal            JTableOffset,x       ; Get the address offset and add to the base address
+                 ldal            JTableOffset+2,x     ; Get the address offset and add to the base address
                  adc             _BASE_ADDR           ; of the current code field line
                  sta             _JTBL_CACHE
 
@@ -40,6 +40,8 @@ _TBDynamicSpriteTile_00
                  adc             #$0200
                  sta             _OP_CACHE
 
+                 ldx             _SPR_X_REG
+
                  CopyDynSpriteWord  {0*SPRITE_PLANE_SPAN}+2;$0000
                  CopyDynSpriteWord  {1*SPRITE_PLANE_SPAN}+2;$1000
                  CopyDynSpriteWord  {2*SPRITE_PLANE_SPAN}+2;$2000
@@ -50,3 +52,68 @@ _TBDynamicSpriteTile_00
                  CopyDynSpriteWord  {7*SPRITE_PLANE_SPAN}+2;$7000
 
                  rts
+
+
+; Masked renderer for a dynamic tile with sprite data overlaid.
+;
+; ]1 : sprite plane offset
+; ]2 : code field offset
+CopyDynSpriteWord MAC
+
+; Need to fill in the first 10 bytes of the JMP handler with the following code sequence where
+; the data and mask from from the sprite plane
+;
+;            lda  $00,x
+;            and  #MASK
+;            ora  #DATA
+;            bra  *+15
+;
+; If MASK == 0, then we can do a PEA.  If MASK == $FFFF, then fall back to the simple Dynamic Tile
+; code.
+                ldal  spritemask+]1,x            ; load the mask value
+                bne   mixed                      ; a non-zero value may be mixed
+
+; This is a solid word
+                lda   #$00F4          ; PEA instruction
+                sta:  ]2,y
+                ldal  spritedata+]1,x ; load the sprite data
+                sta:  ]2+1,y          ; PEA operand
+                bra   next
+
+mixed           cmp   #$FFFF          ; All 1's in the mask is a fully transparent sprite word
+                beq   transparent
+
+                lda   #$004C          ; JMP to handler
+                sta:  ]2,y
+                lda   _JTBL_CACHE     ; Get the offset to the exception handler for this column
+                ora   #{]2&$F000}     ; adjust for the current row offset
+                sta:  ]2+1,y
+                tay                   ; This becomes the new address that we use to patch in
+
+                lda   _OP_CACHE       ; Get the LDA dp,x instruction for this column
+                sta:  $0000,y
+
+                lda   #$0029          ; AND #SPRITE_MASK
+                sta:  $0002,y
+                ldal  spritemask+]1,x 
+                sta:  $0003,y
+
+                lda   #$0009          ; ORA #SPRITE_DATA
+                sta:  $0005,y
+                ldal  spritedata+]1,x
+                sta:  $0006,y
+
+                lda   #$0D80          ; branch to the prologue (BRA *+15)
+                sta:  $0008,y
+
+                ldy   _Y_REG          ; restore original y-register value and move on
+                bra   next
+
+; This is a transparent word, so just show the dynamic data
+transparent
+                lda   #$4800          ; Put the PHA in the third byte
+                sta:  ]2+1,y
+                lda   _OP_CACHE       ; Store the LDA dp,x instruction with operand
+                sta:  ]2,y
+next
+                eom