From 24ebb1f3afd0d32ee3db72ed809c27ada34b183b Mon Sep 17 00:00:00 2001
From: Lucas Scharenbroich <lscharen@prowestgis.com>
Date: Wed, 1 Jun 2022 21:12:54 -0500
Subject: [PATCH] Fix Tile Store lookup initialization bug

---
 src/static/TileStore.s     | 20 ++++++++++++++++----
 src/static/TileStoreDefs.s |  3 +++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/static/TileStore.s b/src/static/TileStore.s
index 0ac2d33..8309773 100644
--- a/src/static/TileStore.s
+++ b/src/static/TileStore.s
@@ -53,6 +53,8 @@ TileStoreData mac
               <<<
 ; 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
+
+; First copy
 ]row                  equ  0
                       lup  TILE_STORE_HEIGHT
                       TileStoreData ]row*2*TILE_STORE_WIDTH
@@ -61,10 +63,20 @@ TileStoreLookup       ENT
 ]row                  equ  ]row+1
                       --^
 
-;                      ds   {TS_LOOKUP_SPAN*TS_LOOKUP_ROWS*2}
-;
-;TILE_STORE_WIDTH      equ  41
-;TILE_STORE_HEIGHT     equ  26
+; Second copy
+]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
+                      --^
+
+; Last row
+                      TileStoreData 0*2*TILE_STORE_WIDTH
+                      TileStoreData 0*2*TILE_STORE_WIDTH
+                      dw   0*2*TILE_STORE_WIDTH
+
 ;-------------------------------------------------------------------------------------
 ;
 ; Other data tables
diff --git a/src/static/TileStoreDefs.s b/src/static/TileStoreDefs.s
index beb278c..d6ccdc2 100644
--- a/src/static/TileStoreDefs.s
+++ b/src/static/TileStoreDefs.s
@@ -78,6 +78,9 @@ VBUFF_ARRAY_ADDR     equ {MAX_SPRITES*40}        ; Fixed address where this spri
 ;TILE_STORE_ADDR_10 equ {MAX_SPRITES*30}
 
 ; 51 rows by 81 columns + 2 extra rows and columns for sprite sizes
+;
+; 53 rows = TILE_STORE_HEIGHT + TILE_STORE_HEIGHT + 1
+; 83 cols = TILE_STORE_WIDTH + TILE_STORE_WIDTH + 1
 TS_LOOKUP_WIDTH   equ 81
 TS_LOOKUP_HEIGHT  equ 51
 TS_LOOKUP_BORDER  equ 2