From: sparky4 <sparky4@cock.li>
Date: Wed, 15 Jun 2016 22:18:37 +0000 (-0500)
Subject: ==== chikyuu sprite sheet added ====
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=6a126810816d927af6a85c555f5a4e1a3c97b3b3;p=16.git

==== chikyuu sprite sheet added ====
---

diff --git a/data/chikyuu.png b/data/chikyuu.png
new file mode 100755
index 00000000..96b5955c
Binary files /dev/null and b/data/chikyuu.png differ
diff --git a/data/chikyuu==.png b/data/chikyuu==.png
new file mode 100755
index 00000000..c7c3d244
Binary files /dev/null and b/data/chikyuu==.png differ
diff --git a/pcx2vrl b/pcx2vrl
index bd947e55..3d9ac6e6 100755
Binary files a/pcx2vrl and b/pcx2vrl differ
diff --git a/pcxsscut b/pcxsscut
index 1deec74d..d743ac3b 100755
Binary files a/pcxsscut and b/pcxsscut differ
diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
index 534ae630..5f5aa9c3 100755
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -487,7 +487,7 @@ void near ScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 	{
 		/* block copy pattern to where we will draw the sprite */
 		vga_setup_wm1_block_copy();
-		_fmemmove(mv[0].video->page[id].data-4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
+		_fmemmove(mv[0].video->page[id].data+4, mv[0].video->page[id].data, mv[0].video->page[id].pagesize);
 		/* must restore Write Mode 0/Read Mode 0 for this code to continue drawing normally */
 		vga_restore_rm0wm0();
 		/* Snap the origin forward */
@@ -597,6 +597,7 @@ sword chkmap(map_t *map, word q)
 	return 0;
 }
 
+//TODO: player position here
 void mapGoTo(map_view_t *mv, int tx, int ty)
 {
 	int px, py;
@@ -631,7 +632,7 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 					vga_state.vga_graphics_ram[o] = (k^j)&15; // VRL samples put all colors in first 15!
 		}
 	}
-//	modexCopyPageRegion(mv[3].page, mv[!(mv->video->p)].page, 0/**/, 0/**/, 0, 128, 28, 36);
+	modexCopyPageRegion(mv[3].page, mv[!(mv->video->p)].page, 0/**/, 0/**/, 0, 128, 28, 36);
 }
 
 
diff --git a/vrl2vrs b/vrl2vrs
index b67956b7..acdd4bda 100755
Binary files a/vrl2vrs and b/vrl2vrs differ
diff --git a/vrsdump b/vrsdump
index dbaba30e..8ba0497d 100755
Binary files a/vrsdump and b/vrsdump differ