From bbbea9b2be18e5c6d3809fdc71106c36793f2f43 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Wed, 27 Dec 2017 10:06:42 -0700
Subject: [PATCH] Lookup for render span VRAM rows

---
 GenerateVRAMYOffset.py |  14 +++++++++++++-
 gscats.2mg             | Bin 819264 -> 819264 bytes
 tables.s               |  12 ++++++++++++
 terrain.s              |   9 +++------
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/GenerateVRAMYOffset.py b/GenerateVRAMYOffset.py
index 6cfa08e..05b3be6 100755
--- a/GenerateVRAMYOffset.py
+++ b/GenerateVRAMYOffset.py
@@ -5,7 +5,6 @@ import sys
 
 def main(argv):
 
-	# Prologue
 	print ("vramYOffset:",end="")
 	rowCount = 19
 	
@@ -19,6 +18,19 @@ def main(argv):
 		if (rowCount<19):
 			print (",", end="")
 
+	print ("\n\vramRowInvertedSpanLookup:",end="")
+	rowCount = 19
+	
+	for jump in range(0,200):
+		rowCount += 1
+		if (rowCount==20):
+			print ("\n\t.word ", end="")
+			rowCount=0
+		
+		print ("$%04x" % ((200-jump)*160+8192), end="")
+		if (rowCount<19):
+			print (",", end="")
+
 
 if __name__ == "__main__":
 	main(sys.argv[1:])
diff --git a/gscats.2mg b/gscats.2mg
index 82c02ca879defb548822760426886076c673314d..9ea57d4475cc519fb78d9b3d8395b5314880dfd2 100644
GIT binary patch
delta 2336
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

delta 2124
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

diff --git a/tables.s b/tables.s
index 6f18ab2..355aa6f 100644
--- a/tables.s
+++ b/tables.s
@@ -152,4 +152,16 @@ vramYOffset:
 	.word $6400,$64a0,$6540,$65e0,$6680,$6720,$67c0,$6860,$6900,$69a0,$6a40,$6ae0,$6b80,$6c20,$6cc0,$6d60,$6e00,$6ea0,$6f40,$6fe0
 	.word $7080,$7120,$71c0,$7260,$7300,$73a0,$7440,$74e0,$7580,$7620,$76c0,$7760,$7800,$78a0,$7940,$79e0,$7a80,$7b20,$7bc0,$7c60
 
+vramRowInvertedSpanLookup:
+	.word $9d00,$9c60,$9bc0,$9b20,$9a80,$99e0,$9940,$98a0,$9800,$9760,$96c0,$9620,$9580,$94e0,$9440,$93a0,$9300,$9260,$91c0,$9120
+	.word $9080,$8fe0,$8f40,$8ea0,$8e00,$8d60,$8cc0,$8c20,$8b80,$8ae0,$8a40,$89a0,$8900,$8860,$87c0,$8720,$8680,$85e0,$8540,$84a0
+	.word $8400,$8360,$82c0,$8220,$8180,$80e0,$8040,$7fa0,$7f00,$7e60,$7dc0,$7d20,$7c80,$7be0,$7b40,$7aa0,$7a00,$7960,$78c0,$7820
+	.word $7780,$76e0,$7640,$75a0,$7500,$7460,$73c0,$7320,$7280,$71e0,$7140,$70a0,$7000,$6f60,$6ec0,$6e20,$6d80,$6ce0,$6c40,$6ba0
+	.word $6b00,$6a60,$69c0,$6920,$6880,$67e0,$6740,$66a0,$6600,$6560,$64c0,$6420,$6380,$62e0,$6240,$61a0,$6100,$6060,$5fc0,$5f20
+	.word $5e80,$5de0,$5d40,$5ca0,$5c00,$5b60,$5ac0,$5a20,$5980,$58e0,$5840,$57a0,$5700,$5660,$55c0,$5520,$5480,$53e0,$5340,$52a0
+	.word $5200,$5160,$50c0,$5020,$4f80,$4ee0,$4e40,$4da0,$4d00,$4c60,$4bc0,$4b20,$4a80,$49e0,$4940,$48a0,$4800,$4760,$46c0,$4620
+	.word $4580,$44e0,$4440,$43a0,$4300,$4260,$41c0,$4120,$4080,$3fe0,$3f40,$3ea0,$3e00,$3d60,$3cc0,$3c20,$3b80,$3ae0,$3a40,$39a0
+	.word $3900,$3860,$37c0,$3720,$3680,$35e0,$3540,$34a0,$3400,$3360,$32c0,$3220,$3180,$30e0,$3040,$2fa0,$2f00,$2e60,$2dc0,$2d20
+	.word $2c80,$2be0,$2b40,$2aa0,$2a00,$2960,$28c0,$2820,$2780,$26e0,$2640,$25a0,$2500,$2460,$23c0,$2320,$2280,$21e0,$2140,$20a0
+
 .include "circleTable.s"
diff --git a/terrain.s b/terrain.s
index e334aaf..adf2f6c 100644
--- a/terrain.s
+++ b/terrain.s
@@ -130,15 +130,12 @@ renderTerrainRowSpans:
 	sta SCRATCHL			; Track span color
 
 	; Find VRAM row
-	lda #200
-	sec
-	sbc PARAML1
+	lda PARAML1
 	asl
 	tax
-	lda vramYOffset,x
-	clc
-	adc #$2000
+	lda vramRowInvertedSpanLookup,x
 	tax
+	
 	adc #160
 	sta PARAML0				; Watch for end of VRAM row