From 3db012d2c0f787658349015165868343d7ff4d6c Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Sun, 17 Sep 2017 13:39:10 -0700
Subject: [PATCH] Smooth terrain working!!

---
 gscats.2mg | Bin 819264 -> 819264 bytes
 terrain.s  |  92 ++++++++++++++++++++++++++++++++++++++++-------------
 2 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/gscats.2mg b/gscats.2mg
index de2fabd2e5616a2c265789dd1e1e9da6af3c9525..1d224252352951dedf313b57e9858f8016420e49 100644
GIT binary patch
delta 2611
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

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

diff --git a/terrain.s b/terrain.s
index a35f462..46d5b28 100644
--- a/terrain.s
+++ b/terrain.s
@@ -16,7 +16,7 @@ VISIBLETERRAINWINDOW = 80				; In words
 ;
 ; No stack operations permitted here!
 ;
-; Current implementation: X cycles per row
+; Current implementation: Unknown cycles per row
 ; Trashes all registers
 ;
 renderTerrain:
@@ -32,9 +32,10 @@ renderTerrain:
 	sta PARAML0
 
 renderTerrainLoop:
-	lda #$0000		; BG/BG
+	; Note that DP register is normally $0000, so that is used as the BG/BG case
+	lda #$0011		; BG/FG
 	ldx #$1111		; FG/FG
-	ldy #$1100		; BG/FG
+	ldy #$1100		; FG/BG
 	jmp (PARAML0)
 
 renderRowComplete:
@@ -230,9 +231,9 @@ compileTerrainDone:
 ; PARAML1 = Row index
 ;
 ; Note: DA = PHX = FG/FG
-;       48 = PHA = BG/BG
+;       48 = PHA = FG/BG
 ;		5A = PHY = BG/FG
-;		0B = PHD =
+;		0B = PHD = BG/BG
 
 compileTerrainRow:
 	SAVE_AXY
@@ -242,30 +243,43 @@ compileTerrainRow:
 compileTerrainColumnLoop:
 	stz compileTerrainOpcode
 
-	; Rightmost byte
+	; Check column 0
 	lda terrainData,x
 	cmp PARAML1
-	bcc compileTerrainColumnBG0
-	beq compileTerrainColumnBG0
+	bcc compileTerrainColumn0BG
+	beq compileTerrainColumn0BG
 
+	; Column 0 is FG, so check column 1
 	inx
 	inx
 	lda terrainData,x
 	cmp PARAML1
-	bcc compileTerrainColumnBG1
-	beq compileTerrainColumnBG1
+	bcc compileTerrainColumn1BG
+	beq compileTerrainColumn1BG
 
 	; Columns 0 and 1 are FG/FG, so PHX
 	lda #$00da
 
 compileTerrainColumn2:
-	sta compileTerrainOpcode
+	sta compileTerrainOpcode	; Cache results so far
+
+	; Check column 2
 	inx
 	inx
 	lda terrainData,x
 	cmp PARAML1
-	bcc compileTerrainColumnBG2
-	beq compileTerrainColumnBG2
+	bcc compileTerrainColumn2BG
+	beq compileTerrainColumn2BG
+
+	; Column 2 is FG, so check column 3
+	inx
+	inx
+	lda terrainData,x
+	cmp PARAML1
+	bcc compileTerrainColumn3BG
+	beq compileTerrainColumn3BG
+
+	; Columns 2 and 3 are FG/FG, so PHX
 	lda compileTerrainOpcode
 	ora #$da00
 
@@ -273,8 +287,6 @@ compileTerrainColumnStore:
 	sta (PARAML0),y
 	inx
 	inx
-	inx
-	inx
 	iny
 	iny
 	cpy #VISIBLETERRAINWIDTH
@@ -283,25 +295,61 @@ compileTerrainColumnStore:
 	RESTORE_AXY
 	rts
 
-compileTerrainColumnBG0:
+compileTerrainColumn0BG:
 
-	; Columns 0 and 1 are BG/BG, so PHA
-	lda #$0048
-	inx		; PHD check goes here?
+	; Column 0 is BG, so check column 1
 	inx
+	inx
+	lda terrainData,x
+	cmp PARAML1
+	bcc compileTerrainColumn01BG
+	beq compileTerrainColumn01BG
+
+	; Columns 0 and 1 are BG/FG, so PHA
+	lda #$0048
 	bra compileTerrainColumn2
 
-compileTerrainColumnBG1:
+compileTerrainColumn01BG:
 
-	; Columns 0 and 1 are BG/FG, so PHY
+	; Columns 0 and 1 are BG/BG, so PHD
+	lda #$000b
+	bra compileTerrainColumn2
+
+compileTerrainColumn1BG:
+
+	; Columns 0 and 1 are FG/BG, so PHY
 	lda #$005a
 	bra compileTerrainColumn2
 
-compileTerrainColumnBG2:
+compileTerrainColumn2BG:
+
+	; Column 2 is BG, so check column 3
+	inx
+	inx
+	lda terrainData,x
+	cmp PARAML1
+	bcc compileTerrainColumn23BG
+	beq compileTerrainColumn23BG
+
+	; Columns 2 and 3 are BG/FG, so PHA
 	lda compileTerrainOpcode
 	ora #$4800
 	bra compileTerrainColumnStore
 
+compileTerrainColumn23BG:
+
+	; Columns 2 and 3 are BG, so PHD
+	lda compileTerrainOpcode
+	ora #$0b00
+	bra compileTerrainColumnStore
+
+compileTerrainColumn3BG:
+
+	; Columns 2 and 3 are FG/BG, so PHY
+	lda compileTerrainOpcode
+	ora #$5a00
+	bra compileTerrainColumnStore
+
 compileTerrainOpcode:
 	.word 0