From 6f7a6d16263bbeec992d3a4eb20c1229881b048a Mon Sep 17 00:00:00 2001
From: Vince Weaver <vincent.weaver@maine.edu>
Date: Mon, 2 Jul 2018 13:55:48 -0400
Subject: [PATCH] hgr: vertical colors sorta right

---
 gr-sim/hgr-sim.c | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/gr-sim/hgr-sim.c b/gr-sim/hgr-sim.c
index a3c7805d..65abd5b6 100644
--- a/gr-sim/hgr-sim.c
+++ b/gr-sim/hgr-sim.c
@@ -90,21 +90,20 @@ int hgr2(void) {
 
 static void hposn(void) {
 
-	unsigned char s;
 	unsigned char msktbl[]={0x81,0x82,0x84,0x88,0x90,0xA0,0xC0};
 
 	// F411
 	ram[HGR_Y]=a;
 	ram[HGR_X]=x;
 	ram[HGR_X+1]=y;
-	s=a;			// pha
+	pha();
 	a=a&0xC0;
 	ram[GBASL]=a;
 	lsr();
 	lsr();
 	a=a|ram[GBASL];
 	ram[GBASL]=a;
-	a=s;
+	pla();
 	// F423
 	ram[GBASH]=a;
 	asl();
@@ -115,23 +114,20 @@ static void hposn(void) {
 	rol_mem(GBASH);
 	asl();
 	ror_mem(GBASL);
-	a=ram[GBASH];
+	lda(GBASH);
 	a=a&0x1f;
 	a=a|ram[HGR_PAGE];
 	ram[GBASH]=a;
 
 	// F438
 	a=x;
-	if (y==0) {
-		c=0;
-		goto hposn_2;
-	} else {
-		c=1;
-	}
+	cpy(0);
+	if (z==1) goto hposn_2;
+
 	y=35;
 	adc(4);
 hposn_1:
-	y++;
+	iny();
 	// f442
 hposn_2:
 	sbc(7);
@@ -406,4 +402,3 @@ int hcolor_equals(int color) {
 
 	return 0;
 }
-