From 299faa006069dd380f9c8c6af6d4dcfceee9cb44 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sat, 18 Nov 2017 23:07:30 -0500
Subject: [PATCH] tfv: fix edge conditions on hlin_double use

---
 tfv/tfv_worldmap.s | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tfv/tfv_worldmap.s b/tfv/tfv_worldmap.s
index 996b92e5..58098df3 100644
--- a/tfv/tfv_worldmap.s
+++ b/tfv/tfv_worldmap.s
@@ -385,7 +385,7 @@ back_forest:
 
 	lda	TFV_Y
 	clc
-	adc	#8
+	adc	#6
 back_forest_loop:
 	pha			; 10, ends at 23
 
@@ -615,6 +615,9 @@ fore_forest:
 	clc
 	adc	#8
 fore_forest_loop:
+	cmp	#36
+	beq	done_forest_loop
+
 	pha
 
 	lsr			; limit=22+(i/4);
@@ -635,8 +638,9 @@ fore_forest_loop:
 	pla
 	clc
 	adc	#2
-	cmp	#36
-	bmi	fore_forest_loop
+	bne	fore_forest_loop
+
+done_forest_loop:
 
 	;====================
 	; Draw tree trunks
@@ -1009,7 +1013,7 @@ draw_north_shore:
 	ldx	#COLOR_BOTH_DARKBLUE
 	stx	COLOR
 
-	lda	#40
+	lda	#39
 	sta	V2
 	ldy	#0
 	lda	#10