From bba8929db762816c5ee0ddfa7f1740caf25b29ad Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich <lscharen@prowestgis.com>
Date: Tue, 31 May 2022 13:01:09 -0500
Subject: [PATCH] PRoperly initialize Lookup tables

---
 src/static/TileStore.s     | 31 ++++++++++++++++++++++++++++---
 src/static/TileStoreDefs.s | 11 ++++++-----
 2 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/static/TileStore.s b/src/static/TileStore.s
index f03cf02..0ac2d33 100644
--- a/src/static/TileStore.s
+++ b/src/static/TileStore.s
@@ -36,10 +36,35 @@ _Sprites       ENT
 ; can be looked up by adding a constant value.
                       ds  \,$00             ; pad to the next page boundary
 TileStoreLookupYTable ENT
-                      ds  {TS_LOOKUP_HEIGHT*2}
-TileStoreLookup       ENT
-                      ds  {TS_LOOKUP_SPAN*TS_LOOKUP_ROWS*2}
+]line                 equ  0
+                      lup  TS_LOOKUP_HEIGHT
+                      dw   ]line
+]line                 equ  ]line+{2*TS_LOOKUP_SPAN}
+                      --^
 
+; Width of tile store is 41 elements
+TileStoreData mac
+              dw  ]1+0,]1+2,]1+4,]1+6,]1+8,]1+10,]1+12,]1+14
+              dw  ]1+16,]1+18,]1+20,]1+22,]1+24,]1+26,]1+28,]1+30
+              dw  ]1+32,]1+34,]1+36,]1+38,]1+40,]1+42,]1+44,]1+46
+              dw  ]1+48,]1+50,]1+52,]1+54,]1+56,]1+58,]1+60,]1+62
+              dw  ]1+64,]1+66,]1+68,]1+70,]1+72,]1+74,]1+76,]1+78
+              dw  ]1+80
+              <<<
+; Create a lookup table with two runs of offsets, plus an overlap area on the end (41+41+1 = 83 = TS_LOOKUP_SPAN)
+TileStoreLookup       ENT
+]row                  equ  0
+                      lup  TILE_STORE_HEIGHT
+                      TileStoreData ]row*2*TILE_STORE_WIDTH
+                      TileStoreData ]row*2*TILE_STORE_WIDTH
+                      dw   ]row*2*TILE_STORE_WIDTH
+]row                  equ  ]row+1
+                      --^
+
+;                      ds   {TS_LOOKUP_SPAN*TS_LOOKUP_ROWS*2}
+;
+;TILE_STORE_WIDTH      equ  41
+;TILE_STORE_HEIGHT     equ  26
 ;-------------------------------------------------------------------------------------
 ;
 ; Other data tables
diff --git a/src/static/TileStoreDefs.s b/src/static/TileStoreDefs.s
index 2ab791a..e08bc61 100644
--- a/src/static/TileStoreDefs.s
+++ b/src/static/TileStoreDefs.s
@@ -75,11 +75,12 @@ VBUFF_ARRAY_ADDR     equ {MAX_SPRITES*40}        ; Fixed address where this spri
 ;TILE_STORE_ADDR_9  equ {MAX_SPRITES*28}
 ;TILE_STORE_ADDR_10 equ {MAX_SPRITES*30}
 
-; 50 rows by 80 columns + 2 extra rows and columns
-TS_LOOKUP_WIDTH   equ 80
-TS_LOOKUP_HEIGHT  equ 50
-TS_LOOKUP_SPAN    equ {TS_LOOKUP_WIDTH+2}
-TS_LOOKUP_ROWS    equ {TS_LOOKUP_HEIGHT+2}
+; 51 rows by 81 columns + 2 extra rows and columns for sprite sizes
+TS_LOOKUP_WIDTH   equ 81
+TS_LOOKUP_HEIGHT  equ 51
+TS_LOOKUP_BORDER  equ 2
+TS_LOOKUP_SPAN    equ {TS_LOOKUP_WIDTH+TS_LOOKUP_BORDER}
+TS_LOOKUP_ROWS    equ {TS_LOOKUP_HEIGHT+TS_LOOKUP_BORDER}
 
 ; Blitter template constancts
 PER_TILE_SIZE     equ   3