From 0de956727ac86a5ed1f561fe22759bb871582994 Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Wed, 15 Feb 2017 17:35:53 -0600
Subject: [PATCH] == code at e0b1c7a and data to 588e089 ==

---
 data/G.PAL         | Bin 768 -> 768 bytes
 src/lib/16_tdef.h  |   1 -
 src/lib/doslib     |   2 +-
 src/lib/scroll16.c |   4 ++--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/G.PAL b/data/G.PAL
index d453ea3551f3fad803eed197d05e4ebbf5b74915..8092380af954e11b165eae773d83f03429619756 100755
GIT binary patch
literal 768
zcmZQz00UMTMh;abZao=UHCcIkH8p*6HCZ5GuP>`_Zf<X`Z*Ol8Q8-GDhQM$N0RXzx
B1#kcW

literal 768
zcmWO42ev~%002NGI>G9qZL}bI)K%_(tN*VsZ|DoJ1oTGwe1?Yy8T{@8bC8)lW1Nyb
zoYK?~prC!|M!PiW%Oy5jjNSPeI*uIPb3?9@v|pK<&`+<ZpSKCS2+6%oDHP{vQi)gx
zXuzk#aw2HW<_0|Y4s7oM+URH5nm6Cv+23RzmWQLdf6AT1;IDQ(Rm@K%sT!p#kgx3X
z%l4ks)K9{^_$Y$o&0+aFP9xYe#+&-cSHo3$*wsbg3Ur6fG9zYbX@5~vEn70gfW@dR
zrxr_8k}7_HEcV893(9?re4)RtLbRNo<b$*vzpR=;H06m~w5>@*zDg0xzrxi@^C~JQ
z(p3*Jdaj*-)aewe_`2qI|B#Fq7LrC%utzxKu4YjJ7>LnROlT%G!FxUp3lc#2Rc2r4
zz1gbPBa-3=+BMnJQ>iNj9T|Q}YOKa+lCDg_XKaKrw>CxL$U(1i0@BX#Zqjr@lG=)@
zIOy(en-<KTC*HhoEn&nRA4SJuZ1-G`UBT;D$#ZOD>QvQzgGp0s+_OGpmv?NvIhqRg
zr9OWv!;^2o(YgG1?l<=N%0tN!1U3ZtZ#9ei+-+5W;=2d_0;g*fjy_&giAk>>rU89V
z%*^?}h8HLO>J2t>WUmw2e;(d*e!loLX^&9T+-zldhMUDmVO1WBWE9ReMb+?dpM>u7
zO$c@*q;rCWlv$E@FO`p548mdAmdHBLi5lVmNuI{6Z7^1}QDOX<3qWG!t4R_dJdlqj
l`>k>J5INoOGH|IBX3t+UB?eNes2wfiKP=<UqFotD`2#ahT%G^`

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 24552c73..58b4e01a 100755
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -320,7 +320,6 @@ typedef struct
 	nibble __near *p;	// pointer to video's render page num
 	nibble __near *sp;	// pointer to video's show page num
 	int dx, dy;	// draw row and col var
-	word dxt,dyt;
 //newer vars!
 	int delta, d;
 } map_view_t;
diff --git a/src/lib/doslib b/src/lib/doslib
index 77b88234..73d44631 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 77b882341bd1c404c8a5a2e07534aae205d71593
+Subproject commit 73d44631cbd6ff2e577fd1fa9a12750ebbcd8c54
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index d4583b99..469ed1f7 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -604,7 +604,7 @@ if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv[id].dx); mod
 			mapDrawTile(mv[id].map->MAPTILESPTR, mv[id].map->layerdata[0].data[i], mv[id].page, mv[id].dx, y);
 			for(z=1;z<=2;z++){
 				if(mv[id].map->layerdata[z].data[i]){
-					sprintf(global_temp_status_text2, "%u", mv[id].map->layerdata[z].data[i]); modexprint(mv[id].page, mv[id].dx, y, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					sprintf(global_temp_status_text2, "%u", mv[id].map->layerdata[z].data[i]); modexprint(mv[id].page, mv[id].dx, (y+((z-1)*4))>>2, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
 					//mapDrawTile(mv[id].map->MAPTILESPTR, mv[id].map->layerdata[z].data[i], mv[id].page, mv[id].dx, y);
 				}
 			}
@@ -630,7 +630,7 @@ if(pagedelayrendermap){ sprintf(global_temp_status_text, "%-3u", mv[id].dy); mod
 			mapDrawTile(mv[id].map->MAPTILESPTR, mv[id].map->layerdata[0].data[i], mv[id].page, x, mv[id].dy);
 			for(z=1;z<=2;z++){
 				if(mv[id].map->layerdata[z].data[i]){
-					sprintf(global_temp_status_text2, "%u", mv[id].map->layerdata[z].data[i]); modexprint(mv[id].page, x, mv[id].dy, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
+					sprintf(global_temp_status_text2, "%u", mv[id].map->layerdata[z].data[i]); modexprint(mv[id].page, (x+((z-1)*4))>>2, mv[id].dy, 1, 0, PALMAPDRAWW, z+2, global_temp_status_text2);
 					//mapDrawTile(mv[id].map->MAPTILESPTR, mv[id].map->layerdata[z].data[i], mv[id].page, x, mv[id].dy);
 				}
 			}
-- 
2.39.5