From e0822f1d126fdc00b5fb8e1de1b84ef0f8f75a4a Mon Sep 17 00:00:00 2001
From: sparky4 <sparky4@cock.li>
Date: Mon, 15 Jun 2015 18:24:21 -0500
Subject: [PATCH] wwww 	modified:   scroll.exe 	modified:   src/scroll.c

---
 scroll.exe   |  Bin 59546 -> 59713 bytes
 src/scroll.c | 1944 ++++++++++++++++++++++++++------------------------
 2 files changed, 997 insertions(+), 947 deletions(-)

diff --git a/scroll.exe b/scroll.exe
index e446180dd08c2a8136cb87853cd21f97b58ffda5..7e8ed183eba4397e27a028e3158f6ac4e34b05d8 100644
GIT binary patch
delta 13760
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
G3Hg6$mUBh`

delta 13315
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

diff --git a/src/scroll.c b/src/scroll.c
index 6546d4de..6670214f 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -5,999 +5,1049 @@
 //====#include "src\lib\ems.c"
 
 //word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-
-typedef struct {
-	map_t *map;
-	page_t *page;
-	int tx; //appears to be the top left tile position on the viewable screen map
-	int ty; //appears to be the top left tile position on the viewable screen map
-	word dxThresh; //????
-	word dyThresh; //????
-} map_view_t;
-
-typedef struct {
-	int x; //player exact position on the viewable map
-	int y; //player exact position on the viewable map
-	int tx; //player tile position on the viewable map
-	int ty; //player tile position on the viewable map
-	int triggerx; //player's trigger box tile position on the viewable map
-	int triggery; //player's trigger box tile position on the viewable map
-	int setx; //NOT USED YET! player sprite sheet set on the image x
-	int sety; //NOT USED YET! player sprite sheet set on the image y
-	word q; //loop variable
-	word d; //direction
-	bitmap_t data; //supposively the sprite sheet data
-	int hp; //hitpoints of the player
-} actor_t;
-
-map_t allocMap(int w, int h);
-void initMap(map_t *map);
-void mapScrollRight(map_view_t *mv, byte offset);
-void mapScrollLeft(map_view_t *mv, byte offest);
-void mapScrollUp(map_view_t *mv, byte offset);
-void mapScrollDown(map_view_t *mv, byte offset);
-void mapGoTo(map_view_t *mv, int tx, int ty);
-void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
-void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
-void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void qclean();
-void pdump(map_view_t *pee);
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);
-
-#define TILEWH 16
-#define QUADWH			TILEWH/2
-#define SPEED 4
-//#define LOOPMAX (TILEWH/SPEED)
-
-//place holder definitions
-//#define MAPX 200
-//#define MAPY 150
-//#define TRIGGX 10
-//#define TRIGGY 9
-
-void main() {
-	size_t oldfreemem=GetFreeSize();
-	/*long emmhandle;
-	long emsavail;
+
+//optimize scroll*!!!!
+
+typedef struct {
+	map_t *map;
+	page_t *page;
+	int tx; //appears to be the top left tile position on the viewable screen map
+	int ty; //appears to be the top left tile position on the viewable screen map
+	word dxThresh; //????
+	word dyThresh; //????
+} map_view_t;
+
+typedef struct {
+	int x; //player exact position on the viewable map
+	int y; //player exact position on the viewable map
+	int tx; //player tile position on the viewable map
+	int ty; //player tile position on the viewable map
+	int triggerx; //player's trigger box tile position on the viewable map
+	int triggery; //player's trigger box tile position on the viewable map
+	int setx; //NOT USED YET! player sprite sheet set on the image x
+	int sety; //NOT USED YET! player sprite sheet set on the image y
+	word q; //loop variable
+	word d; //direction
+	bitmap_t data; //supposively the sprite sheet data
+	int hp; //hitpoints of the player
+} actor_t;
+
+map_t allocMap(int w, int h);
+void initMap(map_t *map);
+void mapScrollRight(map_view_t *mv, byte offset);
+void mapScrollLeft(map_view_t *mv, byte offest);
+void mapScrollUp(map_view_t *mv, byte offset);
+void mapScrollDown(map_view_t *mv, byte offset);
+void mapGoTo(map_view_t *mv, int tx, int ty);
+void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);
+void mapDrawRow(map_view_t *mv, int tx, int ty, word y);
+void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
+void qclean();
+void pdump(map_view_t *pee);
+void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp);
+
+#define TILEWH 16
+#define QUADWH			TILEWH/2
+#define SPEED 4
+//#define LOOPMAX (TILEWH/SPEED)
+
+//place holder definitions
+//#define MAPX 200
+//#define MAPY 150
+//#define TRIGGX 10
+//#define TRIGGY 9
+
+void main() {
+	size_t oldfreemem=GetFreeSize();
+	/*long emmhandle;
+	long emsavail;
 	char teststr[80];*/
-	word panswitch=0, panq=1, pand=0; //for panning!
-	int i;
-	static word paloffset=0;
-	bitmap_t ptmp;//, npctmp; // player sprite
-	planar_buf_t *p;
-	const char *cpus;
-	static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
-	page_t screen, screen2, screen3;
-	map_t map;
-	map_view_t mv, mv2, mv3;
-	map_view_t *bg, *spri, *mask;//, *tmp;
-	byte *dpal, *gpal;
+	word panswitch=0, panq=1, pand=0, panpagenum=0; //for panning!
+	int i;
+	static word paloffset=0;
+	bitmap_t ptmp;//, npctmp; // player sprite
+	planar_buf_t *p;
+	const char *cpus;
+	static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+	page_t screen, screen2, screen3;
+	map_t map;
+	map_view_t mv, mv2, mv3;
+	map_view_t *bg, *spri, *mask;//, *tmp;
+	byte *dpal, *gpal;
 	byte *ptr;
-	byte *mappalptr;
+	byte *mappalptr;
 	actor_t player;
-//	bitmap_t font;
-	//actor_t npc0;
-
-//	atexit(qclean());
-	/*if(!emmtest())
-	{
-		printf("Expanded memory is not present\n");
-		exit(0);
-	}
-
-	if(!emmok())
-	{
-		printf("Expanded memory manager is not present\n");
-		exit(0);
-	}
-
-	emsavail = emmavail();
-	if(emsavail == -1)
-	{
-		printf("Expanded memory manager error\n");
-		exit(0);
-	}
-	printf("There are %ld pages available\n",emsavail);
-
-	if((emmhandle = emmalloc(emsavail)) < 0)
-	{
-		printf("Insufficient pages available\n");
-		exit(0);
-	}*/
-
-	/* create the map */
+//	bitmap_t font;
+	//actor_t npc0;
+
+//	atexit(qclean());
+	/*if(!emmtest())
+	{
+		printf("Expanded memory is not present\n");
+		exit(0);
+	}
+
+	if(!emmok())
+	{
+		printf("Expanded memory manager is not present\n");
+		exit(0);
+	}
+
+	emsavail = emmavail();
+	if(emsavail == -1)
+	{
+		printf("Expanded memory manager error\n");
+		exit(0);
+	}
+	printf("There are %ld pages available\n",emsavail);
+
+	if((emmhandle = emmalloc(emsavail)) < 0)
+	{
+		printf("Insufficient pages available\n");
+		exit(0);
+	}*/
+
+	/* create the map */
 //0000	printf("Total used @ before map load:			%zu\n", oldfreemem-GetFreeSize());
 //0000	fprintf(stderr, "testing~\n");
 	loadmap("data/test.map", &map);
 //0000	fprintf(stderr, "yay map loaded~~\n");
-//----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
-	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
-//----	initMap(&map);
-	mv.map = &map;
-	mv2.map = &map;
-	mv3.map = &map;
-
-	/* draw the tiles */
-	ptr = map.data;
-	mappalptr = map.tiles->data->palette;
-	/* data */
+//----	map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
+	//if(isEMS()) printf("%d tesuto\n", coretotalEMS());
+//----	initMap(&map);
+	mv.map = &map;
+	mv2.map = &map;
+	mv3.map = &map;
+
+	/* draw the tiles */
+	ptr = map.data;
+	mappalptr = map.tiles->data->palette;
+	/* data */
 //0000	printf("Total used @ before image loading:		%zu\n", oldfreemem-GetFreeSize());
 	ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
 //	font = bitmapLoadPcx("data/font.pcx");
-	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
-
-	/* create the planar buffer */
+	//npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
+
+	/* create the planar buffer */
 //0000	printf("Total used @ before planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
 	p = planar_buf_from_bitmap(&ptmp);
-//0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
-
-	/*if(isEMS())
-	{
-		XMOVE mm;
-		mm.length=sizeof(map);
-		mm.sourceH=0;
-		mm.sourceOff=(long)&map;
-		mm.destH=emmhandle;
-		mm.destOff=1;
-		//halp!
-		ist = move_emem(&mm);
-		printf("%d\n", coretotalEMS());
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		//printf("%d\n", emmhandle);
-	}
-
-	if(isEMS())
-	{
-		XMOVE mm;
-		mm.length=emmhandle;
-		mm.sourceH=0;
-		mm.sourceOff=(long)&ptmp;
-		mm.destH=emmhandle;
-		mm.destOff=0;
-		//halp!
-		ist = move_emem(&mm);
-		printf("%d\n", coretotalEMS());
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		//printf("%d\n", emmhandle);
-	}
-*/
-
-	/* save the palette */
-	dpal = modexNewPal();
-	modexPalSave(dpal);
-	modexFadeOff(4, dpal);
-
-	setkb(1);
-	modexEnter();
-	modexPalBlack();	//reset the palette~
-//	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
-	ptmp.offset=(paloffset/3);
-	modexPalUpdate(&ptmp, &paloffset, 0, 0);
-	//printf("	%d\n", sizeof(ptmp.data));
-	//printf("1:	%d\n", paloffset);
-	map.tiles->data->offset=(paloffset/3);
-	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
-	printf("\n====\n");
-	printf("0	paloffset=	%d\n", paloffset/3);
-	printf("====\n\n");
-	gpal = modexNewPal();
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexPalBlack();	//so player will not see loadings~
-
-	/* setup camera and screen~ */
-	screen = modexDefaultPage();
-	screen.width += (TILEWH*2);
-	screen.height += (TILEWH*2)+QUADWH;
-	mv.page = &screen;
-	screen2 = modexNextPage(mv.page);
+//0000	printf("Total used @ after planar buffer creation:	%zu\n", oldfreemem-GetFreeSize());
+
+	/*if(isEMS())
+	{
+		XMOVE mm;
+		mm.length=sizeof(map);
+		mm.sourceH=0;
+		mm.sourceOff=(long)&map;
+		mm.destH=emmhandle;
+		mm.destOff=1;
+		//halp!
+		ist = move_emem(&mm);
+		printf("%d\n", coretotalEMS());
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		//printf("%d\n", emmhandle);
+	}
+
+	if(isEMS())
+	{
+		XMOVE mm;
+		mm.length=emmhandle;
+		mm.sourceH=0;
+		mm.sourceOff=(long)&ptmp;
+		mm.destH=emmhandle;
+		mm.destOff=0;
+		//halp!
+		ist = move_emem(&mm);
+		printf("%d\n", coretotalEMS());
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		//printf("%d\n", emmhandle);
+	}
+*/
+
+	/* save the palette */
+	dpal = modexNewPal();
+	modexPalSave(dpal);
+	modexFadeOff(4, dpal);
+
+	setkb(1);
+	modexEnter();
+	modexPalBlack();	//reset the palette~
+//	printf("Total used @ before palette initiation:		%zu\n", oldfreemem-GetFreeSize());
+	ptmp.offset=(paloffset/3);
+	modexPalUpdate(&ptmp, &paloffset, 0, 0);
+	//printf("	%d\n", sizeof(ptmp.data));
+	//printf("1:	%d\n", paloffset);
+	map.tiles->data->offset=(paloffset/3);
+	modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+	printf("\n====\n");
+	printf("0	paloffset=	%d\n", paloffset/3);
+	printf("====\n\n");
+	gpal = modexNewPal();
+	modexPalSave(gpal);
+	modexSavePalFile("data/g.pal", gpal);
+	modexPalBlack();	//so player will not see loadings~
+
+	/* setup camera and screen~ */
+	screen = modexDefaultPage();
+	screen.width += (TILEWH*2);
+	screen.height += (TILEWH*2)+QUADWH;
+	mv.page = &screen;
+	screen2 = modexNextPage(mv.page);
 	mv2.page = &screen2;
 	screen3 = modexNextPage0(mv2.page, 352, 176);	//(352*176)+1024 is the remaining amount of memory left wwww
 	//screen3 = modexNextPage0(mv2.page, 320, 192);	//(352*176)+1024 is the remaining amount of memory left wwww
-	mv3.page = &screen3;
-
-	/* set up paging */
-	bg = &mv;
-	spri = &mv2;
-	mask = &mv3;
-
-//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
-	mapGoTo(bg, 0, 0);
-	mapGoTo(spri, 0, 0);
-	//mapGoTo(mask, 0, 0);
-
-	//TODO: put player in starting position of spot
-	//default player position on the viewable map
-	player.tx = bg->tx + 10;
-	player.ty = bg->ty + 8;
-	player.x = player.tx*TILEWH;
-	player.y = player.ty*TILEWH;
-	player.triggerx = player.tx;
-	player.triggery = player.ty+1;
-	player.q=1;
-	player.d=0;
-	player.hp=4;
-	//npc
-	/*npc0.tx = bg->tx + 1;
-	npc0.ty = bg->ty + 1;
-	npc0.x = npc0.tx*TILEWH;
-	npc0.y = npc0.ty*TILEWH;
-	npc0.triggerx = npc0.tx;
-	npc0.triggery = npc0.ty+1;
-	npc0.q=1;
-	npc0.d=0;
-	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
-	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-
-	modexShowPage(spri->page);
-//	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
-	modexFadeOn(4, gpal);
-	while(!keyp(1) && player.hp>0)
-	{
-	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
-	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
-	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
+	mv3.page = &screen3;
+
+	/* set up paging */
+	bg = &mv;
+	spri = &mv2;
+	mask = &mv3;
+
+//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
+	mapGoTo(bg, 0, 0);
+	mapGoTo(spri, 0, 0);
+	//mapGoTo(mask, 0, 0);
+
+	//TODO: put player in starting position of spot
+	//default player position on the viewable map
+	player.tx = bg->tx + 10;
+	player.ty = bg->ty + 8;
+	player.x = player.tx*TILEWH;
+	player.y = player.ty*TILEWH;
+	player.triggerx = player.tx;
+	player.triggery = player.ty+1;
+	player.q=1;
+	player.d=0;
+	player.hp=4;
+	//npc
+	/*npc0.tx = bg->tx + 1;
+	npc0.ty = bg->ty + 1;
+	npc0.x = npc0.tx*TILEWH;
+	npc0.y = npc0.ty*TILEWH;
+	npc0.triggerx = npc0.tx;
+	npc0.triggery = npc0.ty+1;
+	npc0.q=1;
+	npc0.d=0;
+	modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);*/
+	modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+
+	modexShowPage(spri->page);
+//	printf("Total used @ before loop:			%zu\n", oldfreemem-GetFreeSize());
+	modexFadeOn(4, gpal);
+	while(!keyp(1) && player.hp>0)
+	{
+	//top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square
+	//to stop scrolling and have the player position data move to the edge of the screen with respect to the direction
+	//when player.tx or player.ty == 0 or player.tx == 20 or player.ty == 15 then stop because that is edge of map and you do not want to walk of the map
 	#define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
 
-	//modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color!
-	/*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
-
-	if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;
-	if(npc0.d>4)
-		npc0.d=0;
-
-	//right movement
-	if(npc0.d == 2)
-	{
-		if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))
-		{
-			if(npc0.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME_NPC;
-				npc0.x+=SPEED;
-				//animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
-				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
-				modexShowPage(spri->page);
-				npc0.q++;
-			} else { npc0.q = 1; npc0.d = 0; npc0.tx++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp);
-			modexShowPage(spri->page);
-			npc0.d = 0;
-		}
-		npc0.triggerx = npc0.tx+1;
-		npc0.triggery = npc0.ty;
-	}
-
-	//left movement
-	if(npc0.d == 4)
-	{
-		if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty))
-		{
-			if(npc0.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME_NPC;
-				npc0.x-=SPEED;
-				//animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
-				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
-				modexShowPage(spri->page);
-				npc0.q++;
-			} else { npc0.q = 1; npc0.d = 0; npc0.tx--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp);
-			modexShowPage(spri->page);
-			npc0.d = 0;
-		}
-		npc0.triggerx = npc0.tx-1;
-		npc0.triggery = npc0.ty;
-	}
-
-	//down movement
-	if(npc0.d == 3)
-	{
-		if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))
-		{
-			if(npc0.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME_NPC;
-				npc0.y+=SPEED;
-				//animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
-				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
-				modexShowPage(spri->page);
-				npc0.q++;
-			} else { npc0.q = 1; npc0.d = 0; npc0.ty++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);
-			modexShowPage(spri->page);
-			npc0.d = 0;
-		}
-		npc0.triggerx = npc0.tx;
-		npc0.triggery = npc0.ty+1;
-	}
-
-	//up movement
-	if(npc0.d == 1)
-	{
-		if(npc0.ty > 1 && !(npc0.tx == TRIGGX &&  npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1))
-		{
-			if(npc0.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME_NPC;
-				npc0.y-=SPEED;
-				//animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
-				modexShowPage(spri->page);
-				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
-				npc0.q++;
-			} else { npc0.q = 1; npc0.d = 0; npc0.ty--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp);
-			modexShowPage(spri->page);
-			npc0.d = 0;
-		}
-		npc0.triggerx = npc0.tx;
-		npc0.triggery = npc0.ty-1;
-	}
-
-	if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; }
-*/
-
-	//player movement
+	//modexClearRegion(bg->page, player.x, player.y, 16, 16, 4); //currently the over scan color!
+	/*#define INC_PER_FRAME_NPC if(npc0.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
+
+	if(npc0.d == 0 && npc0.q == 1) npc0.d =rand()%8;
+	if(npc0.d>4)
+		npc0.d=0;
+
+	//right movement
+	if(npc0.d == 2)
+	{
+		if(npc0.tx < map.width && !(npc0.tx+1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.x+=SPEED;
+				//animatePlayer(bg, spri, mask, 1, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.tx++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 32, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx+1;
+		npc0.triggery = npc0.ty;
+	}
+
+	//left movement
+	if(npc0.d == 4)
+	{
+		if(npc0.tx > 1 && !(npc0.tx-1 == TRIGGX && npc0.ty == TRIGGY) && !(npc0.tx-1 == player.tx && npc0.ty == player.ty))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.x-=SPEED;
+				//animatePlayer(bg, spri, mask, 3, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.tx--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 96, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx-1;
+		npc0.triggery = npc0.ty;
+	}
+
+	//down movement
+	if(npc0.d == 3)
+	{
+		if(npc0.ty < map.height && !(npc0.tx == TRIGGX && npc0.ty+1 == TRIGGY) && !(npc0.tx == player.tx && npc0.ty == player.ty+1))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.y+=SPEED;
+				//animatePlayer(bg, spri, mask, 2, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				modexShowPage(spri->page);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.ty++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 64, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx;
+		npc0.triggery = npc0.ty+1;
+	}
+
+	//up movement
+	if(npc0.d == 1)
+	{
+		if(npc0.ty > 1 && !(npc0.tx == TRIGGX &&  npc0.ty-1 == TRIGGY) && !(npc0.tx+1 == player.tx && npc0.ty == player.ty-1))
+		{
+			if(npc0.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME_NPC;
+				npc0.y-=SPEED;
+				//animatePlayer(bg, spri, mask, 0, 0, npc0.x, npc0.y, persist_aniframe, q, &npctmp);
+				modexShowPage(spri->page);
+				animatePlayer(bg, spri, npc0.d-1, 0, npc0.x, npc0.y, persist_aniframe, npc0.q, &npctmp);
+				npc0.q++;
+			} else { npc0.q = 1; npc0.d = 0; npc0.ty--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, npc0.x-4, npc0.y-TILEWH, npc0.x-4, npc0.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, npc0.x-4, npc0.y-TILEWH, 24, 0, 24, 32, &npctmp);
+			modexShowPage(spri->page);
+			npc0.d = 0;
+		}
+		npc0.triggerx = npc0.tx;
+		npc0.triggery = npc0.ty-1;
+	}
+
+	if((npc0.triggery == player.ty && npc0.triggerx == player.tx) || (npc0.ty == player.ty && npc0.tx == player.tx)){ player.hp--; }
+*/
+
+	//player movement
 	//TODO: make movement into a function!
-	if(!panswitch){
-	//right movement
-	if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)
-	{
-		if(player.d == 0){ player.d = 2; }
+	if(!panswitch){
+	//right movement
+	if((keyp(77) && !keyp(75) && player.d == 0) || player.d == 2)
+	{
+		if(player.d == 0){ player.d = 2; }
 		if(bg->tx >= 0 && bg->tx+20 < map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollRight(bg, SPEED);
-				mapScrollRight(spri, SPEED);
-				//mapScrollRight(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx++; }
-		}
-		else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.x+=SPEED;
-				//animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx+1;
-		player.triggery = player.ty;
-	}
-
-	//left movement
-	if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)
-	{
-		if(player.d == 0){ player.d = 4; }
+		!(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				//animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				mapScrollRight(bg, SPEED);
+				mapScrollRight(spri, SPEED);
+				//mapScrollRight(mask, SPEED);
+				modexShowPage(spri->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.tx++; }
+		}
+		else if(player.tx < map.width && !(bg->map->data[(player.tx)+(map.width*(player.ty-1))] == 0))//!(player.tx+1 == TRIGGX && player.ty == TRIGGY))
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				player.x+=SPEED;
+				//animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				modexShowPage(spri->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.tx++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);
+			modexShowPage(spri->page);
+			player.d = 0;
+		}
+		player.triggerx = player.tx+1;
+		player.triggery = player.ty;
+	}
+
+	//left movement
+	if((keyp(75) && !keyp(77) && player.d == 0) || player.d == 4)
+	{
+		if(player.d == 0){ player.d = 4; }
 		if(bg->tx > 0 && bg->tx+20 <= map.width && player.tx == bg->tx + 10 &&
-		!(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollLeft(bg, SPEED);
-				mapScrollLeft(spri, SPEED);
-				//mapScrollLeft(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx--; }
-		}
-		else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.x-=SPEED;
-				//animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.tx--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx-1;
-		player.triggery = player.ty;
-	}
-
-	//down movement
-	if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)
-	{
-		if(player.d == 0){ player.d = 3; }
+		!(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))	//collision detection!
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				//animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				mapScrollLeft(bg, SPEED);
+				mapScrollLeft(spri, SPEED);
+				//mapScrollLeft(mask, SPEED);
+				modexShowPage(spri->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.tx--; }
+		}
+		else if(player.tx > 1 && !(bg->map->data[(player.tx-2)+(map.width*(player.ty-1))] == 0))//!(player.tx-1 == TRIGGX && player.ty == TRIGGY))
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				player.x-=SPEED;
+				//animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				modexShowPage(spri->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.tx--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);
+			modexShowPage(spri->page);
+			player.d = 0;
+		}
+		player.triggerx = player.tx-1;
+		player.triggery = player.ty;
+	}
+
+	//down movement
+	if((keyp(80) && !keyp(72) && player.d == 0) || player.d == 3)
+	{
+		if(player.d == 0){ player.d = 3; }
 		if(bg->ty >= 0 && bg->ty+15 < map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollDown(bg, SPEED);
-				mapScrollDown(spri, SPEED);
-				//mapScrollDown(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty++; }
-		}
-		else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.y+=SPEED;
-				//animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty++; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx;
-		player.triggery = player.ty+1;
-	}
-
-	//up movement
-	if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)
-	{
-		if(player.d == 0){ player.d = 1; }
-		if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
-		!(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				//animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);
-				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				mapScrollUp(bg, SPEED);
-				mapScrollUp(spri, SPEED);
-				//mapScrollUp(mask, SPEED);
-				modexShowPage(spri->page);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty--; }
-		}
-		else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
-		{
-			if(player.q<=(TILEWH/SPEED))
-			{
-				INC_PER_FRAME;
-				player.y-=SPEED;
-				//animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);
-				modexShowPage(spri->page);
-				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
-				player.q++;
-			} else { player.q = 1; player.d = 0; player.ty--; }
-		}
-		else
-		{
-			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
-			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
-			modexShowPage(spri->page);
-			player.d = 0;
-		}
-		player.triggerx = player.tx;
-		player.triggery = player.ty-1;
-	}
-}else{
-//88 switch!
-	//right movement
-	if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)
-	{
-		if(pand == 0){ pand = 2; }
-			if(panq<=(TILEWH/SPEED))
+		!(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))	//collision detection!
+		{
+			if(player.q<=(TILEWH/SPEED))
 			{
-				bg->page->dx++;
-				spri->page->dx++;
-				mask->page->dx++;
-				modexShowPage(bg->page);
+				INC_PER_FRAME;
+				//animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				mapScrollDown(bg, SPEED);
+				mapScrollDown(spri, SPEED);
+				//mapScrollDown(mask, SPEED);
 				modexShowPage(spri->page);
-				modexShowPage(mask->page);
-				panq++;
-			} else { panq = 1; pand = 0; }
-	}
-	//left movement
-	if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)
-	{
-		if(pand == 0){ pand = 4; }
-			if(panq<=(TILEWH/SPEED))
-			{
-				bg->page->dx--;
-				spri->page->dx--;
-				mask->page->dx--;
-				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.ty++; }
+		}
+		else if(player.ty < map.height && !(bg->map->data[(player.tx-1)+(map.width*(player.ty))] == 0))//!(player.tx == TRIGGX && player.ty+1 == TRIGGY))
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				player.y+=SPEED;
+				//animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
 				modexShowPage(spri->page);
-				modexShowPage(mask->page);
-				panq++;
-			} else { panq = 1; pand = 0; }
-	}
-	//down movement
-	if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)
-	{
-		if(pand == 0){ pand = 3; }
-			if(panq<=(TILEWH/SPEED))
-			{
-				bg->page->dy--;
-				spri->page->dy--;
-				mask->page->dy--;
-				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.ty++; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
+			modexShowPage(spri->page);
+			player.d = 0;
+		}
+		player.triggerx = player.tx;
+		player.triggery = player.ty+1;
+	}
+
+	//up movement
+	if((keyp(72) && !keyp(80) && player.d == 0) || player.d == 1)
+	{
+		if(player.d == 0){ player.d = 1; }
+		if(bg->ty > 0 && bg->ty+15 <= map.height && player.ty == bg->ty + 8 &&
+		!(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX && player.ty-1 == TRIGGY))	//collision detection!
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				//animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);
+				animatePlayer(bg, spri, player.d-1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				mapScrollUp(bg, SPEED);
+				mapScrollUp(spri, SPEED);
+				//mapScrollUp(mask, SPEED);
 				modexShowPage(spri->page);
-				modexShowPage(mask->page);
-				panq++;
-			} else { panq = 1; pand = 0; }
-	}
-	//up movement
-	if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)
-	{
-		if(pand == 0){ pand = 1; }
-			if(panq<=(TILEWH/SPEED))
-			{
-				bg->page->dy++;
-				spri->page->dy++;
-				mask->page->dy++;
-				modexShowPage(bg->page);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.ty--; }
+		}
+		else if(player.ty > 1 && !(bg->map->data[(player.tx-1)+(map.width*(player.ty-2))] == 0))//!(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
+		{
+			if(player.q<=(TILEWH/SPEED))
+			{
+				INC_PER_FRAME;
+				player.y-=SPEED;
+				//animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);
 				modexShowPage(spri->page);
-				modexShowPage(mask->page);
-				panq++;
-			} else { panq = 1; pand = 0; }
+				animatePlayer(bg, spri, player.d-1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);
+				player.q++;
+			} else { player.q = 1; player.d = 0; player.ty--; }
+		}
+		else
+		{
+			modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);
+			modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);
+			modexShowPage(spri->page);
+			player.d = 0;
+		}
+		player.triggerx = player.tx;
+		player.triggery = player.ty-1;
+	}
+}else{
+//88 switch!
+	//right movement
+	if((keyp(77) && !keyp(75) && pand == 0) || pand == 2)
+	{
+		if(pand == 0){ pand = 2; }
+			if(panq<=(TILEWH/SPEED))
+			{
+				switch(panpagenum)
+				{
+					case 0:
+						//bg
+						bg->page->dx++;
+						modexShowPage(bg->page);
+					break;
+					case 1:
+						//spri
+						spri->page->dx++;
+						modexShowPage(spri->page);
+					break;
+					case 2:
+						//fg
+						mask->page->dx++;
+						modexShowPage(mask->page);
+					break;
+				}
+				panq++;
+			} else { panq = 1; pand = 0; }
+	}
+	//left movement
+	if((keyp(75) && !keyp(77) && pand == 0) || pand == 4)
+	{
+		if(pand == 0){ pand = 4; }
+			if(panq<=(TILEWH/SPEED))
+			{
+				switch(panpagenum)
+				{
+					case 0:
+						//bg
+						bg->page->dx--;
+						modexShowPage(bg->page);
+					break;
+					case 1:
+						//spri
+						spri->page->dx--;
+						modexShowPage(spri->page);
+					break;
+					case 2:
+						//fg
+						mask->page->dx--;
+						modexShowPage(mask->page);
+					break;
+				}
+				panq++;
+			} else { panq = 1; pand = 0; }
+	}
+	//down movement
+	if((keyp(72) && !keyp(80) && pand == 0) || pand == 3)
+	{
+		if(pand == 0){ pand = 3; }
+			if(panq<=(TILEWH/SPEED))
+			{
+				switch(panpagenum)
+				{
+					case 0:
+						//bg
+						bg->page->dy--;
+						modexShowPage(bg->page);
+					break;
+					case 1:
+						//spri
+						spri->page->dy--;
+						modexShowPage(spri->page);
+					break;
+					case 2:
+						//fg
+						mask->page->dy--;
+						modexShowPage(mask->page);
+					break;
+				}
+				panq++;
+			} else { panq = 1; pand = 0; }
+	}
+	//up movement
+	if((keyp(80) && !keyp(72) && pand == 0) || pand == 1)
+	{
+		if(pand == 0){ pand = 1; }
+			if(panq<=(TILEWH/SPEED))
+			{
+				switch(panpagenum)
+				{
+					case 0:
+						//bg
+						bg->page->dy++;
+						modexShowPage(bg->page);
+					break;
+					case 1:
+						//spri
+						spri->page->dy++;
+						modexShowPage(spri->page);
+					break;
+					case 2:
+						//fg
+						mask->page->dy++;
+						modexShowPage(mask->page);
+					break;
+				}
+				panq++;
+			} else { panq = 1; pand = 0; }
 	}
 }
 
 	//the scripting stuf....
-
+
 	//if(((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
-	if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
-	{
-		short i;
-		for(i=800; i>=400; i--)
-		{
-			sound(i);
-		}
-		nosound();
-	}
+	if(((bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))] == 0) && keyp(0x1C))||(player.tx == 5 && player.ty == 5))
+	{
+		short i;
+		for(i=800; i>=400; i--)
+		{
+			sound(i);
+		}
+		nosound();
+	}
 	if(player.q == (TILEWH/SPEED)+1 && player.d > 0 && (player.triggerx == 5 && player.triggery == 5)){ player.hp--; }
-	//debugging binds!
+	//debugging binds!
 	//if(keyp(0x0E)) while(1){ if(xmsmalloc(24)) break; }
-	if(keyp(2)) modexShowPage(bg->page);
-	if(keyp(3)) modexShowPage(spri->page);
-	if(keyp(4)) modexShowPage(mask->page);
+	if(keyp(2)){ modexShowPage(bg->page); panpagenum=0; }
+	if(keyp(3)){ modexShowPage(spri->page); panpagenum=1; }
+	if(keyp(4)){ modexShowPage(mask->page); panpagenum=2; }
 	if(keyp(0x44)){ bputs(spri->page, player.x+(TILEWH*2), player.y+(TILEWH*2), "wwww"); }	//f10
-	if(keyp(25)){ pdump(bg); pdump(spri); }	//p
-	if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }
-	if(keyp(22)){
-	paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
-	printf("1paloffset	=	%d\n", paloffset/3);
-	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
-	printf("2paloffset	=	%d\n", paloffset/3);
+	if(keyp(25)){ pdump(bg); pdump(spri); }	//p
+	if(keyp(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg); pdump(spri); }
+	if(keyp(22)){
+	paloffset=0; modexPalBlack(); modexPalUpdate(&ptmp, &paloffset, 0, 0);
+	printf("1paloffset	=	%d\n", paloffset/3);
+	 modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+	printf("2paloffset	=	%d\n", paloffset/3);
 	 pdump(bg); pdump(spri); }
-	//pan switch
+	//pan switch
 	if(keyp(88)){if(!panswitch) panswitch++; else panswitch--; }	//f12
-	//TSR
-	if(keyp(87))	//f11
-	{
-		modexLeave();
-		setkb(0);
-		__asm
-		{
-			mov ah,31h
-			int 21h
-		}
+	//TSR
+	if(keyp(87))	//f11
+	{
+		modexLeave();
+		setkb(0);
+		__asm
+		{
+			mov ah,31h
+			int 21h
+		}
 	}
 
 	if((player.q==1) && !(player.x%TILEWH==0 && player.y%TILEWH==0)) break;	//incase things go out of sync!
-
-	}
-
-	/* fade back to text mode */
-	/* but 1st lets save the game palette~ */
-	modexPalSave(gpal);
-	modexSavePalFile("data/g.pal", gpal);
-	modexFadeOff(4, gpal);
-	modexLeave();
-	setkb(0);
-	printf("Project 16 scroll.exe\n");
-	printf("tx: %d\n", bg->tx);
+
+	}
+
+	/* fade back to text mode */
+	/* but 1st lets save the game palette~ */
+	modexPalSave(gpal);
+	modexSavePalFile("data/g.pal", gpal);
+	modexFadeOff(4, gpal);
+	modexLeave();
+	setkb(0);
+	printf("Project 16 scroll.exe\n");
+	printf("tx: %d\n", bg->tx);
 	printf("ty: %d\n", bg->ty);
-	printf("player.x: %d", player.x); printf("		player.y: %d\n", player.y);
-	//if(player.hp==0) printf("%d wwww\n", player.y+8);
-	//else printf("\nplayer.y: %d\n", player.y);
-	printf("player.tx: %d", player.tx); printf("		player.ty: %d\n", player.ty);
-	printf("player.triggx: %d", player.triggerx); printf("	player.triggy: %d\n", player.triggery);
+	printf("player.x: %d", player.x); printf("		player.y: %d\n", player.y);
+	//if(player.hp==0) printf("%d wwww\n", player.y+8);
+	//else printf("\nplayer.y: %d\n", player.y);
+	printf("player.tx: %d", player.tx); printf("		player.ty: %d\n", player.ty);
+	printf("player.triggx: %d", player.triggerx); printf("	player.triggy: %d\n", player.triggery);
 	printf("player.hp: %d", player.hp);	printf("	player.q: %d", player.q);	printf("	player.d: %d\n", player.d);
-	printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);
-	printf("palette offset:	%d\n", paloffset/3);
-	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
-	printf("Total free: %zu\n", GetFreeSize());
-	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
-	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
-	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
+	printf("tile data value at player trigger position: %d\n", bg->map->data[(player.triggerx-1)+(map.width*(player.triggery-1))]);
+	printf("palette offset:	%d\n", paloffset/3);
+	printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+	printf("Total free: %zu\n", GetFreeSize());
+	printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
+	printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
+	printf("Screen: %dx", screen.width);	printf("%d\n", screen.height);
 	printf("Screen2: %dx", screen2.width);	printf("%d\n", screen2.height);
-	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
-	//xmsfree(&map);
-	//xmsfree(bg);
-	//xmsfree(spri);
-	//xmsfree(mask);
-	//xmsreport();
+	//printf("map.width=%d	map.height=%d	map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
+	//xmsfree(&map);
+	//xmsfree(bg);
+	//xmsfree(spri);
+	//xmsfree(mask);
+	//xmsreport();
 	//emmclose(emmhandle);
 	printf("%Fp\n", bios_8x8_font());
-	//printf("%c\n", *bios_8x8_font());
-	switch(detectcpu())
-	{
-		case 0: cpus = "8086/8088 or 186/88"; break;
-		case 1: cpus = "286"; break;
-		case 2: cpus = "386 or newer"; break;
-		default: cpus = "internal error"; break;
-	}
-	printf("detected CPU type: %s\n", cpus);
-	modexFadeOn(4, dpal);
-}
-
-
-map_t
-allocMap(int w, int h) {
-	map_t result;
-
-	result.width =w;
-	result.height=h;
-	result.data = malloc(sizeof(byte) * w * h);
-	//result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);
-	/*if(isEMS() || checkEMS())
-	{
-		XMOVE mm;
-		//emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
-		mm.length=sizeof(result);
-		mm.sourceH=0;
-		mm.sourceOff=ptr2long(&result);
-		mm.destH=emmhandle;
-		mm.destOff=0;
-		ist = move_emem(&mm);
-		if(!ist){ dealloc_emem(emmhandle); exit(5); }
-		printf("%d\n", coretotalEMS());
-	}*/
-
-	return result;
-}
-
-void
-initMap(map_t *map) {
-	/* just a place holder to fill out an alternating pattern */
-	int x, y, xx, yy;
-	int i, q;
-//	int tile = 1;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles = malloc(sizeof(tiles_t));
-	//else
-	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
-
-	/* create the tile set */
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data = malloc(sizeof(bitmap_t));
-	//else
-	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
-//	map->tiles->data->width = (TILEWH/**2*/);
-//	map->tiles->data->height= TILEWH;
-	//if(!isEMS() || !checkEMS())
-//		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
-	//else
-	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
-//	map->tiles->tileHeight = TILEWH;
-//	map->tiles->tileWidth =TILEWH;
-//	map->tiles->rows = 1;
-//	map->tiles->cols = 1;//2;
-
-	/*q=0;
-	//for(y=0; y<map->height; y++) {
-	//for(x=0; x<map->width; x++) {
-	i=0;
-	for(yy=0; yy<TILEWH; yy++) {
-	for(xx=0; xx<(TILEWH); xx++) {
-		//if(x<TILEWH){
-		  map->tiles->data->data[i+1] = map->data[q];//28;//0x24;
-//		  printf("[%d]", map->tiles->data->data[i]);
-		//}else{
-		  //map->tiles->data->data[i] = map->data[q];//0;//0x34;
-		  //printf("]%d[==[%d]", i, map->tiles->data->data[i]);
-		//}
-		i++;
-	}
-//	printf("\n");
-	}
-//	printf("[%d]", map->data[q]);
-	q++;
-//	}
-	//printf("\n\n");
-//	}*/
-
-	/*i=0;
-	for(y=0; y<map->height; y++) {
-		for(x=0; x<map->width; x++) {
-//			map->data[i]=255;
-			printf("[%d]", map->data[i]);
-			//tile = tile ? 0 : 1;
-			i++;
-		}
-		//tile = tile ? 0 : 1;
-	}*/
-}
-
-
-void
-mapScrollRight(map_view_t *mv, byte offset) {
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv->page->dx += offset;
-
-	/* check to see if this changes the tile */
-	if(mv->page->dx >= mv->dxThresh ) {
-	/* go forward one tile */
-	mv->tx++;
-	/* Snap the origin forward */
-	mv->page->data += 4;
-	mv->page->dx = mv->map->tiles->tileWidth;
-	//}
-
-	/* draw the next column */
-	x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
-		mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
-	}
-}
-
-
-void
-mapScrollLeft(map_view_t *mv, byte offset) {
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv->page->dx -= offset;
-
-	/* check to see if this changes the tile */
-	if(mv->page->dx == 0) {
-	/* go backward one tile */
-	mv->tx--;
-
-	/* Snap the origin backward */
-	mv->page->data -= 4;
-	mv->page->dx = mv->map->tiles->tileWidth;
-	//}
-	/* draw the next column */
-		mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
-	}
-}
-
-
-void
-mapScrollUp(map_view_t *mv, byte offset) {
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv->page->dy -= offset;
-
-	/* check to see if this changes the tile */
-	if(mv->page->dy == 0 ) {
-	/* go down one tile */
-	mv->ty--;
-	/* Snap the origin downward */
-	mv->page->data -= mv->page->width*4;
-	mv->page->dy = mv->map->tiles->tileHeight;
-	//}
-
-	/* draw the next row */
-	y= 0;
-		mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
-	}
-}
-
-
-void
-mapScrollDown(map_view_t *mv, byte offset) {
-	word x, y;  /* coordinate for drawing */
-
-	/* increment the pixel position and update the page */
-	mv->page->dy += offset;
-
-	/* check to see if this changes the tile */
-	if(mv->page->dy >= mv->dyThresh ) {
-	/* go down one tile */
-	mv->ty++;
-	/* Snap the origin downward */
-	mv->page->data += mv->page->width*4;
-	mv->page->dy = mv->map->tiles->tileHeight;
-	//}
-
-	/* draw the next row */
-	y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
-		mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
-	}
-
-}
-
-
-void
-mapGoTo(map_view_t *mv, int tx, int ty) {
-	int px, py;
-	unsigned int i;
-
-	/* set up the coordinates */
-	mv->tx = tx;
-	mv->ty = ty;
-	mv->page->dx = mv->map->tiles->tileWidth;
-	mv->page->dy = mv->map->tiles->tileHeight;
-
-	/* set up the thresholds */
-	mv->dxThresh = mv->map->tiles->tileWidth * 2;
-	mv->dyThresh = mv->map->tiles->tileHeight * 2;
-
-	/* draw the tiles */
-	modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);
+	//printf("%c\n", *bios_8x8_font());
+	switch(detectcpu())
+	{
+		case 0: cpus = "8086/8088 or 186/88"; break;
+		case 1: cpus = "286"; break;
+		case 2: cpus = "386 or newer"; break;
+		default: cpus = "internal error"; break;
+	}
+	printf("detected CPU type: %s\n", cpus);
+	modexFadeOn(4, dpal);
+}
+
+
+map_t
+allocMap(int w, int h) {
+	map_t result;
+
+	result.width =w;
+	result.height=h;
+	result.data = malloc(sizeof(byte) * w * h);
+	//result.data = (byte *)alloc_emem(((int)sizeof(byte) * w * h)/1024);
+	/*if(isEMS() || checkEMS())
+	{
+		XMOVE mm;
+		//emmhandle = mallocEMS(coretotalEMS());//alloc_emem((int)sizeof(map))
+		mm.length=sizeof(result);
+		mm.sourceH=0;
+		mm.sourceOff=ptr2long(&result);
+		mm.destH=emmhandle;
+		mm.destOff=0;
+		ist = move_emem(&mm);
+		if(!ist){ dealloc_emem(emmhandle); exit(5); }
+		printf("%d\n", coretotalEMS());
+	}*/
+
+	return result;
+}
+
+void
+initMap(map_t *map) {
+	/* just a place holder to fill out an alternating pattern */
+	int x, y, xx, yy;
+	int i, q;
+//	int tile = 1;
+	//if(!isEMS() || !checkEMS())
+//		map->tiles = malloc(sizeof(tiles_t));
+	//else
+	//	map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));
+
+	/* create the tile set */
+	//if(!isEMS() || !checkEMS())
+//		map->tiles->data = malloc(sizeof(bitmap_t));
+	//else
+	//	map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));
+//	map->tiles->data->width = (TILEWH/**2*/);
+//	map->tiles->data->height= TILEWH;
+	//if(!isEMS() || !checkEMS())
+//		map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
+	//else
+	//	map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);
+//	map->tiles->tileHeight = TILEWH;
+//	map->tiles->tileWidth =TILEWH;
+//	map->tiles->rows = 1;
+//	map->tiles->cols = 1;//2;
+
+	/*q=0;
+	//for(y=0; y<map->height; y++) {
+	//for(x=0; x<map->width; x++) {
+	i=0;
+	for(yy=0; yy<TILEWH; yy++) {
+	for(xx=0; xx<(TILEWH); xx++) {
+		//if(x<TILEWH){
+		  map->tiles->data->data[i+1] = map->data[q];//28;//0x24;
+//		  printf("[%d]", map->tiles->data->data[i]);
+		//}else{
+		  //map->tiles->data->data[i] = map->data[q];//0;//0x34;
+		  //printf("]%d[==[%d]", i, map->tiles->data->data[i]);
+		//}
+		i++;
+	}
+//	printf("\n");
+	}
+//	printf("[%d]", map->data[q]);
+	q++;
+//	}
+	//printf("\n\n");
+//	}*/
+
+	/*i=0;
+	for(y=0; y<map->height; y++) {
+		for(x=0; x<map->width; x++) {
+//			map->data[i]=255;
+			printf("[%d]", map->data[i]);
+			//tile = tile ? 0 : 1;
+			i++;
+		}
+		//tile = tile ? 0 : 1;
+	}*/
+}
+
+
+void
+mapScrollRight(map_view_t *mv, byte offset) {
+	word x, y;  /* coordinate for drawing */
+
+	/* increment the pixel position and update the page */
+	mv->page->dx += offset;
+
+	/* check to see if this changes the tile */
+	if(mv->page->dx >= mv->dxThresh ) {
+	/* go forward one tile */
+	mv->tx++;
+	/* Snap the origin forward */
+	mv->page->data += 4;
+	mv->page->dx = mv->map->tiles->tileWidth;
+	//}
+
+	/* draw the next column */
+	x= SCREEN_WIDTH + mv->map->tiles->tileWidth;
+		mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);
+	}
+}
+
+
+void
+mapScrollLeft(map_view_t *mv, byte offset) {
+	word x, y;  /* coordinate for drawing */
+
+	/* increment the pixel position and update the page */
+	mv->page->dx -= offset;
+
+	/* check to see if this changes the tile */
+	if(mv->page->dx == 0) {
+	/* go backward one tile */
+	mv->tx--;
+
+	/* Snap the origin backward */
+	mv->page->data -= 4;
+	mv->page->dx = mv->map->tiles->tileWidth;
+	//}
+	/* draw the next column */
+		mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);
+	}
+}
+
+
+void
+mapScrollUp(map_view_t *mv, byte offset) {
+	word x, y;  /* coordinate for drawing */
+
+	/* increment the pixel position and update the page */
+	mv->page->dy -= offset;
+
+	/* check to see if this changes the tile */
+	if(mv->page->dy == 0 ) {
+	/* go down one tile */
+	mv->ty--;
+	/* Snap the origin downward */
+	mv->page->data -= mv->page->width*4;
+	mv->page->dy = mv->map->tiles->tileHeight;
+	//}
+
+	/* draw the next row */
+	y= 0;
+		mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);
+	}
+}
+
+
+void
+mapScrollDown(map_view_t *mv, byte offset) {
+	word x, y;  /* coordinate for drawing */
+
+	/* increment the pixel position and update the page */
+	mv->page->dy += offset;
+
+	/* check to see if this changes the tile */
+	if(mv->page->dy >= mv->dyThresh ) {
+	/* go down one tile */
+	mv->ty++;
+	/* Snap the origin downward */
+	mv->page->data += mv->page->width*4;
+	mv->page->dy = mv->map->tiles->tileHeight;
+	//}
+
+	/* draw the next row */
+	y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;
+		mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);
+	}
+
+}
+
+
+void
+mapGoTo(map_view_t *mv, int tx, int ty) {
+	int px, py;
+	unsigned int i;
+
+	/* set up the coordinates */
+	mv->tx = tx;
+	mv->ty = ty;
+	mv->page->dx = mv->map->tiles->tileWidth;
+	mv->page->dy = mv->map->tiles->tileHeight;
+
+	/* set up the thresholds */
+	mv->dxThresh = mv->map->tiles->tileWidth * 2;
+	mv->dyThresh = mv->map->tiles->tileHeight * 2;
+
+	/* draw the tiles */
+	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) {
-		mapDrawRow(mv, tx-1, ty, py);
-	i+=mv->map->width - tx;
-	}
-}
-
-
-void
-mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
-	word rx;
-	word ry;
-	//if(i==0) i=2;
-	if(i==0)
-	{
+	for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {
+		mapDrawRow(mv, tx-1, ty, py);
+	i+=mv->map->width - tx;
+	}
+}
+
+
+void
+mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {
+	word rx;
+	word ry;
+	//if(i==0) i=2;
+	if(i==0)
+	{
 		//wwww
-		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
-	}
-	else
-	{
-	rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
+		modexClearRegion(page, x, y, t->tileWidth, t->tileHeight, 0); //currently the over scan color!
+	}
+	else
+	{
+	rx = (((i-1) % ((t->data->width)/t->tileWidth)) * t->tileWidth);
 	ry = (((i-1) / ((t->data->height)/t->tileHeight)) * t->tileHeight);
-////0000	printf("i=%d\n", i);
-	//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);
-	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
-	}
-}
-
-
-void
-mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
-	word x;
-	int i;
-
-	/* the position within the map array */
+////0000	printf("i=%d\n", i);
+	//mxPutTile(t->data, x, y, t->tileWidth, t->tileHeight);
+	modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, (t->data));
+	}
+}
+
+
+void
+mapDrawRow(map_view_t *mv, int tx, int ty, word y) {
+	word x;
+	int i;
+
+	/* 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++) {
-	if(i>=0) {
-		/* we are in the map, so copy! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i++; /* next! */
-	}
-}
-
-void
-mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
-	int y;
-	int i;
-
-	/* location in the map array */
-	i=ty * mv->map->width + tx;
-
-	/* 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++) {
-	if(i>=0) {
-		/* we are in the map, so copy away! */
-		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
-	}
-	i += mv->map->width;
-	}
-}
-
-void qclean()
-{
-	modexLeave();
-	setkb(0);
-}
-
-void pdump(map_view_t *pee)
-{
-	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->page, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
-			palcol++;
-		}
-	}
-}
-
-void
-animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)
-{
-	sword dire=32*d; //direction
-	sword qq; //scroll offset
-
-	if(scrolloffsetswitch==0) qq = 0;
-	else qq = ((lp)*SPEED);
-	switch (d)
-	{
-		case 0:
-			//up
-			x=x-4;
-			y=y-qq-TILEWH;
-		break;
-		case 1:
-			// right
-			x=x+qq-4;
-			y=y-TILEWH;
-		break;
-		case 2:
-			//down
-			x=x-4;
-			y=y+qq-TILEWH;
-		break;
-		case 3:
-			//left
-			x=x-qq-4;
-			y=y-TILEWH;
-		break;
-	}
-	modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
-	if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
-	if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
-	if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
-	if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
-	//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
-	if(detectcpu() > 0) modexWaitBorder();
-}
+	for(x=0; x<SCREEN_WIDTH+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);
+	}
+	i++; /* next! */
+	}
+}
+
+void
+mapDrawCol(map_view_t *mv, int tx, int ty, word x) {
+	int y;
+	int i;
+
+	/* location in the map array */
+	i=ty * mv->map->width + tx;
+
+	/* 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++) {
+	if(i>=0) {
+		/* we are in the map, so copy away! */
+		mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);
+	}
+	i += mv->map->width;
+	}
+}
+
+void qclean()
+{
+	modexLeave();
+	setkb(0);
+}
+
+void pdump(map_view_t *pee)
+{
+	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->page, palx+TILEWH, paly+TILEWH, mult, mult, palcol);
+			palcol++;
+		}
+	}
+}
+
+void
+animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword d, short scrolloffsetswitch, int x, int y, int ls, int lp, bitmap_t *bmp)
+{
+	sword dire=32*d; //direction
+	sword qq; //scroll offset
+
+	if(scrolloffsetswitch==0) qq = 0;
+	else qq = ((lp)*SPEED);
+	switch (d)
+	{
+		case 0:
+			//up
+			x=x-4;
+			y=y-qq-TILEWH;
+		break;
+		case 1:
+			// right
+			x=x+qq-4;
+			y=y-TILEWH;
+		break;
+		case 2:
+			//down
+			x=x-4;
+			y=y+qq-TILEWH;
+		break;
+		case 3:
+			//left
+			x=x-qq-4;
+			y=y-TILEWH;
+		break;
+	}
+	modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);
+	if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else
+	if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else
+	if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else
+	if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }
+	//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
+	if(detectcpu() > 0) modexWaitBorder();
+}
-- 
2.39.5