X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscroll16.c;h=24837c4b2f80d4cf3a2f05c58c36385252384186;hb=d31b48962de4f4384cca54f92db59ccc0bb06fbc;hp=06f582633a4a475c13149035b47a882fbadbf6d8;hpb=2c089e89d0aac8c00062094ce1b4f39d5958b797;p=16.git

diff --git a/src/lib/scroll16.c b/src/lib/scroll16.c
old mode 100644
new mode 100755
index 06f58263..24837c4b
--- a/src/lib/scroll16.c
+++ b/src/lib/scroll16.c
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
  *
  * This file is part of Project 16.
  *
@@ -27,11 +27,12 @@
 void walk(map_view_t *pip, player_t *player, word pn)
 {
 	#define INC_PER_FRAME if(player[pn].q&1) player[pn].persist_aniframe++; if(player[pn].persist_aniframe>4) player[pn].persist_aniframe = 1;
-	//right movement
-	switch(player[pn].info.dir)
+	switch(player[pn].d)
 	{
+		//right movement
 		case 3:
-			if(pip[0].tx >= 0 && pip[0].tx+20 < pip[0].map->width && player[pn].tx == pip[0].tx + 10 &&
+			//printf("pip[0].page->tilesw=%d\n", pip[0].page->tilesw);
+			if(pip[0].tx >= 0 && pip[0].tx+pip[0].page->tilesw < pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
 			!(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
 			{
 				if(player[pn].q<=(TILEWH/(player[pn].speed)))
@@ -42,7 +43,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					mapScrollRight(pip, player, 1, pn);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].tx++; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
 			}
 			else if(player[pn].tx < pip[0].map->width && !(pip[0].map->data[(player[pn].tx)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx+1 == TRIGGX && player[pn].ty == TRIGGY))
 			{
@@ -53,14 +54,18 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					animatePlayer(pip, player, pn, 0);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].tx++; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx++; }
 			}
 			else
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
-				modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, &player[pn].data);
+#ifdef SPRITE
+				PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 24, 32, PLAYERBMPDATA);
+#else
+				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 14);
+#endif
 				modexShowPage(pip[1].page);
-				player[pn].info.dir = 0;
+				player[pn].d = 2;
 			}
 			player[pn].triggerx = player[pn].tx+1;
 			player[pn].triggery = player[pn].ty;
@@ -68,7 +73,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 
 		//left movement
 		case 1:
-			if(pip[0].tx > 0 && pip[0].tx+20 <= pip[0].map->width && player[pn].tx == pip[0].tx + 10 &&
+			if(pip[0].tx > 0 && pip[0].tx+pip[0].page->tilesw <= pip[0].map->width && player[pn].tx == pip[0].tx+pip[0].page->tilemidposscreenx &&
 			!(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))	//collision detection!
 			{
 				if(player[pn].q<=(TILEWH/(player[pn].speed)))
@@ -79,7 +84,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					mapScrollLeft(pip, player, 1, pn);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].tx--; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
 			}
 			else if(player[pn].tx > 1 && !(pip[0].map->data[(player[pn].tx-2)+(pip[0].map->width*(player[pn].ty-1))] == 0))//!(player[pn].tx-1 == TRIGGX && player[pn].ty == TRIGGY))
 			{
@@ -90,14 +95,18 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					animatePlayer(pip, player, pn, 0);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].tx--; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].tx--; }
 			}
 			else
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
-				modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, &player[pn].data);
+#ifdef SPRITE
+				PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 96, 24, 32, PLAYERBMPDATA);
+#else
+				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 10);
+#endif
 				modexShowPage(pip[1].page);
-				player[pn].info.dir = 0;
+				player[pn].d = 2;
 			}
 			player[pn].triggerx = player[pn].tx-1;
 			player[pn].triggery = player[pn].ty;
@@ -105,7 +114,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 
 		//down movement
 		case 4:
-			if(pip[0].ty >= 0 && pip[0].ty+15 < pip[0].map->height && player[pn].ty == pip[0].ty + 8 &&
+			if(pip[0].ty >= 0 && pip[0].ty+pip[0].page->tilesh < pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
 			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))	//collision detection!
 			{
 				if(player[pn].q<=(TILEWH/(player[pn].speed)))
@@ -116,7 +125,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					mapScrollDown(pip, player, 1, pn);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].ty++; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
 			}
 			else if(player[pn].ty < pip[0].map->height && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty+1 == TRIGGY))
 			{
@@ -127,14 +136,18 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					animatePlayer(pip, player, pn, 0);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].ty++; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty++; }
 			}
 			else
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
-				modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, &player[pn].data);
+#ifdef SPRITE
+				PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 64, 24, 32, PLAYERBMPDATA);
+#else
+				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 9);
+#endif
 				modexShowPage(pip[1].page);
-				player[pn].info.dir = 0;
+				player[pn].d = 2;
 			}
 			player[pn].triggerx = player[pn].tx;
 			player[pn].triggery = player[pn].ty+1;
@@ -142,7 +155,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 
 		//up movement
 		case 0:
-			if(pip[0].ty > 0 && pip[0].ty+15 <= pip[0].map->height && player[pn].ty == pip[0].ty + 8 &&
+			if(pip[0].ty > 0 && pip[0].ty+pip[0].page->tilesh <= pip[0].map->height && player[pn].ty == pip[0].ty+pip[0].page->tilemidposscreeny &&
 			!(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX && player[pn].ty-1 == TRIGGY))	//collision detection!
 			{
 				if(player[pn].q<=(TILEWH/(player[pn].speed)))
@@ -153,7 +166,7 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					mapScrollUp(pip, player, 1, pn);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].ty--; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
 			}
 			else if(player[pn].ty > 1 && !(pip[0].map->data[(player[pn].tx-1)+(pip[0].map->width*(player[pn].ty-2))] == 0))//!(player[pn].tx == TRIGGX &&  player[pn].ty-1 == TRIGGY))
 			{
@@ -164,14 +177,18 @@ void walk(map_view_t *pip, player_t *player, word pn)
 					animatePlayer(pip, player, 0, pn);
 					modexShowPage(pip[1].page);
 					player[pn].q++;
-				} else { player[pn].q = 1; player[pn].info.dir = 0; player[pn].ty--; }
+				} else { player[pn].q = 1; player[pn].d = 2; player[pn].ty--; }
 			}
 			else
 			{
 				modexCopyPageRegion(pip[1].page, pip[0].page, player[pn].x-4, player[pn].y-TILEWH, player[pn].x-4, player[pn].y-TILEWH, 24, 32);
-				modexDrawSpriteRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, &player[pn].data);
+#ifdef SPRITE
+				PBUFSFUN(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 0, 24, 32, PLAYERBMPDATA);
+#else
+				modexClearRegion(pip[1].page, player[pn].x-4, player[pn].y-TILEWH, 24, 32, 12);
+#endif
 				modexShowPage(pip[1].page);
-				player[pn].info.dir = 0;
+				player[pn].d = 2;
 			}
 			player[pn].triggerx = player[pn].tx;
 			player[pn].triggery = player[pn].ty-1;
@@ -266,7 +283,7 @@ initMap(map_t *map) {
 	}
 }*/
 
-void mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -284,17 +301,17 @@ void mapScrollRight(map_view_t *mv, player_t *player, word id, word plid)
 	}
 
 	/* draw the next column */
-	x= SCREEN_WIDTH + mv[id].map->tiles->tileWidth;
+	x= mv[0].page->sw + mv[id].map->tiles->tileWidth;
 	if(player[plid].q%4)
 		if(id==0)
-			mapDrawCol(&mv[0], mv[0].tx + 20 , mv[0].ty-1, x, player, mv->page->dx);
+			mapDrawCol(&mv[0], mv[0].tx + mv[0].page->tilesw, mv[0].ty-1, x, player, mv->page->dx);
 		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
+			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2));
 	//}
 }
 
 
-void mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -318,12 +335,12 @@ void mapScrollLeft(map_view_t *mv, player_t *player, word id, word plid)
 		if(id==0)
 			mapDrawCol(&mv[0], mv[0].tx - 1, mv[0].ty-1, x, player, mv->page->dx);
 		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*17);
+			modexCopyPageRegion(mv[id].page, mv[0].page, x, 0, x, 0, mv[id].map->tiles->tileWidth, mv[id].map->tiles->tileHeight*(mv[0].page->tilesh+2));
 	//}
 }
 
 
-void mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -346,11 +363,11 @@ void mapScrollUp(map_view_t *mv, player_t *player, word id, word plid)
 		if(id==0)
 			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty-1, y, player, mv->page->dy);
 		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
+			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight);
 	//}
 }
 
-void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
+void near mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 {
 	word x, y;  /* coordinate for drawing */
 
@@ -368,26 +385,42 @@ void mapScrollDown(map_view_t *mv, player_t *player, word id, word plid)
 	}
 
 	/* draw the next row */
-	y= SCREEN_HEIGHT + mv[id].map->tiles->tileHeight;
+	y= mv[0].page->sh + mv[id].map->tiles->tileHeight;
 	if(player[plid].q%3)
 		if(id==0)
-			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+15, y, player, mv->page->dy);
+			mapDrawRow(&mv[0], mv[0].tx - 1, mv[0].ty+mv[0].page->tilesh, y, player, mv->page->dy);
 		else
-			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*22, mv[id].map->tiles->tileHeight);
+			modexCopyPageRegion(mv[id].page, mv[0].page, 0, y, 0, y, mv[id].map->tiles->tileWidth*(mv[0].page->tilesw+2), mv[id].map->tiles->tileHeight);
 	//}
 }
 
 sword chkmap(map_t *map, word q)
 {
 //	bitmap_t bp;
-	byte x[MAPW*MAPH] = { 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };
+	static byte x[(MAPW*MAPH)+1] =
+{ 1, 2, 3, 4, 0, 3, 3, 3, 3, 3, 3, 3, 3, 4, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 6, 7, 8, 0, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 10, 11, 12, 4, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 0, 1, 1, 1, 5, 8, 1, 11, 11, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 4, 0, 0, 0, 0, 0, 8, 8, 1, 11, 11, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 8, 8, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 1, 2, 3, 4, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 5, 6, 7, 8, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 9, 10, 11, 12, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 13, 14, 15, 16, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 6, 6, 6, 6, 6, 6, 6, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 3, 3, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 10, 10 };
+/*1,	2,	3,	4,	0,	3,	3,	3,	3,	3,	3,	3,	3,	4,	1,	1,	1,	1,	1,	1,	\
+5,	6,	7,	8,	0,	1,	0,	1,	0,	0,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+9,	10,	11,	12,	4,	1,	0,	1,	0,	0,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+13,	14,	15,	16,	0,	1,	1,	1,	5,	8,	1,	11,	11,	1,	1,	1,	1,	1,	1,	1,	\
+0,	0,	4,	0,	0,	0,	0,	0,	8,	8,	1,	11,	11,	3,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	0,	0,	0,	0,	8,	8,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	0,	0,	0,	0,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	0,	0,	0,	0,	1,	1,	1,	1,	1,	1,	1,	1,	3,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	3,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	3,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	\
+1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	3,	3,	3,	3,	1,	2,	3,	4 };*/
 	//check for failed to load map
-	if((map->width == map->height == 0) || (q>0))
+	if((map->width == map->height == 0) && (q>0))
 	{
 		//initiate a null map!
-		map->width=MAPW;
-		map->height=MAPH;
-		map->data = malloc((map->width*map->height)*sizeof(byte));
+		map->width=MAPW;///2;
+		map->height=MAPH;///2;
+//		map->data = malloc(((map->width*map->height)+1)*sizeof(byte));
 		map->data = &x;
 		map->tiles = malloc(sizeof(tiles_t));
 		//fix this to be far~
@@ -400,6 +433,7 @@ sword chkmap(map_t *map, word q)
 		map->tiles->cols = 1;
 		map->tiles->debug_text = true;
 	}
+	else map->tiles->debug_text = false;
 	return 0;
 }
 
@@ -422,18 +456,20 @@ void mapGoTo(map_view_t *mv, int tx, int ty)
 	modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
 	py=0;
 	i=mv->ty * mv->map->width + mv->tx;
-	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
+	for(ty=mv->ty-1; py < mv->page->sh+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
 		mapDrawWRow(mv, tx-1, ty, py);
 	i+=mv->map->width - tx;
 	}
 }
 
 
-void
+void near
 mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 {
 	word rx;
 	word ry;
+	word textx=0;
+	word texty=0;
 	//if(i==0) i=2;
 	if(i==0)
 	{
@@ -448,16 +484,32 @@ mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y)
 		switch(t->debug_text)
 		{
 			case 0:
-				modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+#ifndef TILERENDER
+				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, ((t->debug_data[i])+1));
+				//cannot print number value du to it being slow as bakapee
+#else
+				PBUFBFUN		(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+				/* then the sprite. note modding ram ptr means we just draw to (x&3,0) */
+				//draw_vrl1_vgax_modex(x-rx,y-ry,vrl_header,vrl_lineoffs,buffer+sizeof(*vrl_header),bufsz-sizeof(*vrl_header));
+				//modexDrawBmpRegion	(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+#endif
 			break;
 			case 1:
-				modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));
+				modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, (t->debug_data[i]+1));
+				//modexprintbig(page, x, y, 1, 15, 0, (t->debug_data));
+				/*for(texty=0; texty<2; texty++)
+				{
+					for(textx=0; textx<2; textx++)
+					{*/
+//						modexprint(page, x+(textx*8), y+(texty*8), 1, (word)(t->debug_data), 0, (t->debug_data));
+/*					}
+				}*/
 			break;
 		}
 	}
 }
 
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset)
+void near mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopoffset)
 {
 	word x;
 	int i;
@@ -465,7 +517,7 @@ void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopof
 //printf("y: %d\n", poopoffset);
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=poopoffset; x<(SCREEN_WIDTH+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	for(x=poopoffset; x<(mv->page->sw+mv->dxThresh)/(poopoffset+1) && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -474,7 +526,7 @@ void mapDrawRow(map_view_t *mv, int tx, int ty, word y, player_t *p, word poopof
 	}
 }
 
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset)
+void near mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopoffset)
 {
 	int y;
 	int i;
@@ -485,7 +537,7 @@ void mapDrawCol(map_view_t *mv, int tx, int ty, word x, player_t *p, word poopof
 
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=poopoffset; y<(SCREEN_HEIGHT+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	for(y=poopoffset; y<(mv->page->sh+mv->dyThresh)/(poopoffset+1) && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
 		/* we are in the map, so copy away! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -501,7 +553,7 @@ void mapDrawWRow(map_view_t *mv, int tx, int ty, word y)
 
 	/* the position within the map array */
 	i=ty * mv->map->width + tx;
-	for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
+	for(x=0; x<mv->page->sw+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {
 	if(i>=0) {
 		/* we are in the map, so copy! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -520,7 +572,7 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 
 	/* We'll copy all of the columns in the screen,
 	   i + 1 row above and one below */
-	for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
+	for(y=0; y<mv->page->sh+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {
 	if(i>=0) {
 		/* we are in the map, so copy away! */
 		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
@@ -529,91 +581,113 @@ void mapDrawWCol(map_view_t *mv, int tx, int ty, word x)
 	}
 }
 
-void qclean()
+/*void qclean()
 {
-	modexLeave();
 	//setkb(0);
-}
+}*/
 
-void pdump(page_t *pee)
+/*	sync	*/
+void shinku(global_game_variables_t *gv)
 {
-	int mult=(QUADWH);
-	int palq=(mult)*TILEWH;
-	int palcol=0;
-	int palx, paly;
-	for(paly=0; paly<palq; paly+=mult){
-		for(palx=0; palx<palq; palx+=mult){
-				modexClearRegion(pee, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
-			palcol++;
-		}
+	//modexCopyPageRegion(pip[1].page, pip[2].page, 16, 16, 16, 16, (14*8)+4, 8+4);
+	if(elapsed_timer(gv) >= (1.0 / gv->kurokku.frames_per_second))
+	{
+		word x = (16);
+		word y = (16);
+		word col = 7;
+		word bgcol = 0;
+		word type = 0;
+
+		//t=(((*(gv->clock))-gv->clock_start) /18.2);
+		sprintf(gv->pee, "%f fps", (double)gv->kurokku.tiku/ticktock(gv));
+//		printf("%s\n", gv->pee);
+		//FIXME PLEASE!!
+		modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
+//++++	modexprint(&(gv->video.page[0]), x, y, type, col, bgcol, gv->pee);
+		//(gv->clock_start)=*(gv->clock);
+		gv->kurokku.tiku=0;
 	}
-}
-
-//sync!
-void shinku(page_t *page, global_game_variables_t *gv)
-{
-	byte *pee;
-	word x = (SCREEN_WIDTH/2);
-	word y = (SCREEN_HEIGHT/2);
-	word col = 15;
-	word bgcol = 0;
-	word type = 1;
-	if(elapsed_timer(gv) >= (1.0 / gv->frames_per_second))
+	//modexprint(page, 16, 16, 1, 15, 0, pee);
+	gv->kurokku.tiku++;
+	switch(gv->kurokku.fpscap)
 	{
-		pee = malloc(sizeof(double));
-		sprintf(pee, "%f", (((0x046C)-(gv->t)) /18.2));
-		modexprint(page, x, y, type, col, bgcol, pee);
-		sprintf(pee, "%f", elapsed_timer(gv));
-		modexprint(page, x, y+16, type, col, bgcol, pee);
+		case 0:
+			//modexprint(page, 16, 32, 1, 15, 0, "sanic!");
+			gv->kurokku.frames_per_second=1;
+		break;
+		case 1:
+			//turn this off if XT
+			modexWaitBorder();
+			//vga_wait_for_vsync();
+			gv->kurokku.frames_per_second=60;
+		break;
 	}
 }
 
-void animatePlayer(map_view_t *pip, player_t *player, word playnum, sword scrollswitch)
+void near animatePlayer(map_view_t *pip, player_t *player, word pn, sword scrollswitch)
 {
-	sword dire=32; //direction
+	sword x = player[pn].x;
+	sword y = player[pn].y;
+#ifdef SPRITE
+	word dire=32; //direction
+#else
+	word dire=8; //direction
+#endif
 	sword qq; //scroll offset
-	word ls = player[playnum].persist_aniframe;
+	word ls = player[pn].persist_aniframe;
 
 	if(scrollswitch==0) qq = 0;
-	else qq = ((player[playnum].persist_aniframe)*player[playnum].speed);
-	switch (player[playnum].info.dir)
+	else qq = ((player[pn].q)*(player[pn].speed));
+	x-=4;
+	y-=TILEWH;
+	switch (player[pn].d)
 	{
 		case 0:
 			//up
-			dire*=player[playnum].info.dir;
-			player[playnum].x=player[playnum].x-4;
-			player[playnum].y=player[playnum].y-qq-TILEWH;
+			dire*=player[pn].d;
+			y-=qq;
 		break;
-		case 1:
+		case 3:
 			// right
-			dire*=(player[playnum].info.dir-2);
-			player[playnum].x=player[playnum].x+qq-4;
-			player[playnum].y=player[playnum].y-TILEWH;
+			dire*=(player[pn].d-2);
+			x+=qq;
 		break;
 		case 2:
 		break;
-		case 3:
+		case 4:
 			//down
-			dire*=(player[playnum].info.dir-2);
-			player[playnum].x=player[playnum].x-4;
-			player[playnum].y=player[playnum].y+qq-TILEWH;
+			dire*=(player[pn].d-2);
+			y+=qq;
 		break;
-		case 4:
+		case 1:
 			//left
-			dire*=(player[playnum].info.dir+2);
-			player[playnum].x=player[playnum].x-qq-4;
-			player[playnum].y=player[playnum].y-TILEWH;
+			dire*=(player[pn].d+2);
+			x-=qq;
 		break;
 	}
-	modexCopyPageRegion(pip[1].page, pip[0].page, player[playnum].x-4, player[playnum].y-4, player[playnum].x-4, player[playnum].y-4, 28, 40);
-	if(2>ls && ls>=1) { modexDrawSpriteRegion(pip[1].page, player[playnum].x, player[playnum].y, 48, dire, 24, 32, &player[playnum].data); }else
-	if(3>ls && ls>=2) { modexDrawSpriteRegion(pip[1].page, player[playnum].x, player[playnum].y, 24, dire, 24, 32, &player[playnum].data); }else
-	if(4>ls && ls>=3) { modexDrawSpriteRegion(pip[1].page, player[playnum].x, player[playnum].y, 0, dire, 24, 32, &player[playnum].data); }else
-	if(5>ls && ls>=4) { modexDrawSpriteRegion(pip[1].page, player[playnum].x, player[playnum].y, 24, dire, 24, 32, &player[playnum].data); }
+
+#ifdef SPRITE
+// #define FRAME1 PBUFSFUN(pip[1].page, x, y, 48, dire, 24, 32,	PLAYERBMPDATA);
+// #define FRAME2 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATA);
+// #define FRAME3 PBUFSFUN(pip[1].page, x, y, 0, dire, 24, 32,	PLAYERBMPDATA);
+// #define FRAME4 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATA);
+#define FRAME1 PBUFSFUN(pip[1].page, x, y, 48, dire, 24, 32,	PLAYERBMPDATA);
+#define FRAME2 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATA);
+#define FRAME3 PBUFSFUN(pip[1].page, x, y, 0, dire, 24, 32,	PLAYERBMPDATA);
+#define FRAME4 PBUFSFUN(pip[1].page, x, y, 24, dire, 24, 32,	PLAYERBMPDATA);
+#else
+#define FRAME1 modexClearRegion(pip[1].page, x, y, 24, 32, 2+dire);
+#define FRAME2 modexClearRegion(pip[1].page, x, y, 24, 32, 1+dire);
+#define FRAME3 modexClearRegion(pip[1].page, x, y, 24, 32, dire);
+#define FRAME4 modexClearRegion(pip[1].page, x, y, 24, 32, 1+dire);
+#endif
+	modexCopyPageRegion(pip[1].page, pip[0].page, x-4, y-4, x-4, y-4, 28, 40);
+	//modexCopyPageRegion(pip[2].page, pip[1].page, 16, 16, 16, 16, (14*8)+4, 8+4);
+	if(2>ls && ls>=1) { FRAME1 }else
+	if(3>ls && ls>=2) { FRAME2 }else
+	if(4>ls && ls>=3) { FRAME3 }else
+	if(5>ls && ls>=4) { FRAME4 }
 	//TODO: mask copy //modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
 	//modexClearRegion(top->page, 66, 66, 2, 40, 0);
 	//modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);
-	//turn this off if XT
-	//XTif(detectcpu() > 0)
-	modexWaitBorder();
 }