OSDN Git Service

modified: Project 16.bfproject
authorsparky4 <sparky4@cock.li>
Fri, 5 Dec 2014 01:20:14 +0000 (19:20 -0600)
committersparky4 <sparky4@cock.li>
Fri, 5 Dec 2014 01:20:14 +0000 (19:20 -0600)
modified:   scroll.exe
modified:   src/scroll.c

Project 16.bfproject
scroll.exe
src/scroll.c

index d88f2d0..efeda4a 100644 (file)
@@ -2,13 +2,14 @@ c2e.convert_special: 0
 e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:60:0:0:
 openfiles: /dos/z/16/16.c:0:0:0:
-openfiles: /dos/z/16/src/scroll.c:4410:3763:1:
+openfiles: /dos/z/16/src/scroll.c:9353:8838:1:
 openfiles: /dos/z/16/src/lib/scroll.c:1666:0:0:
 openfiles: /dos/z/16/src/lib/scroll.h:1961:241:0:
+openfiles: /dos/z/16/src/v2/source/ENGINE/CONTROLS.C:2441:1179:0:
 openfiles: /dos/z/16/src/lib/modex16.c:13778:13034:0:
 openfiles: /dos/z/16/src/lib/modex16.h:2059:913:0:
 openfiles: /dos/z/16/src/pcxtest.c:68:0:0:
-openfiles: /dos/z/16/src/lib/dos_kb.c:107:0:0:
+openfiles: /dos/z/16/src/lib/dos_kb.c:3352:2801:0:
 openfiles: /dos/z/16/src/lib/dos_kb.h:62:0:0:
 openfiles: /dos/z/16/src/lib/lib_head.h:165:0:0:
 openfiles: /dos/z/16/src/palettec.c:176:0:0:
@@ -32,10 +33,10 @@ view_left_panel: 0
 default_mime_type: text/plain
 e2c.convert_xml: 1
 c2e.convert_iso: 0
-opendir: file:///dos/z/16/16
+opendir: file:///dos/z/16/src/v2/source/ENGINE
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: modexPalUpdate
+ssearch_text: UnPress(
 snr_casesens: 1
 view_blocks: 1
 name: project 16
@@ -67,7 +68,6 @@ ssearch_regex: 0
 e2c.convert_iso: 0
 ssearch_casesens: 0
 charmap_block: 1
-recent_files: file:///dos/z/16/16/modex16/modex16.h
 recent_files: file:///dos/z/16/16/modex16/scroll.c
 recent_files: file:///dos/z/16/16/modex16/dos_kb.c
 recent_files: file:///dos/z/16/16/modex16/makefile
@@ -96,27 +96,28 @@ recent_files: file:///dos/z/keen-src/id_rf.h
 recent_files: file:///dos/z/keen-src/id_rf_a.asm
 recent_files: file:///dos/z/keen-src/id_rf.c
 recent_files: file:///dos/z/16/gfx.pal
-recent_files: file:///dos/z/16/src/test.c
+recent_files: file:///dos/z/16/src/scroll.c
 recent_files: file:///dos/z/16/doc/project.txt
-recent_files: file:///dos/z/16/src/lib/modex16.h
-recent_files: file:///dos/z/16/src/lib/modex16.c
 recent_files: file:///dos/z/16/src/lib/scroll.h
 recent_files: file:///dos/z/16/src/lib/scroll.c
+recent_files: file:///dos/z/16/src/lib/modex16.h
+recent_files: file:///dos/z/16/src/pcxtest.c
+recent_files: file:///dos/z/16/16.c
+recent_files: file:///dos/z/16/src/lib/modex16.c
 recent_files: file:///dos/z/16/src/lib/dos_kb.c
 recent_files: file:///dos/z/16/src/lib/dos_kb.h
 recent_files: file:///dos/z/16/src/lib/lib_head.h
-recent_files: file:///dos/z/16/src/pcxtest.c
-recent_files: file:///dos/z/16/16.c
-recent_files: file:///dos/z/16/src/scroll.c
-recent_files: file:///dos/z/16/src/test2.c
-recent_files: file:///dos/z/16/src/lib/lib_head.cpp
-recent_files: file:///dos/z/16/src/lib/bitmap.c
 recent_files: file:///dos/z/16/src/palettec.c
+recent_files: file:///dos/z/16/src/test.c
+recent_files: file:///dos/z/16/src/test2.c
 recent_files: file:///dos/z/16/src/lib/bitmap.h
-recent_files: file:///dos/z/16/src/lib/types.h
+recent_files: file:///dos/z/16/src/lib/bitmap.c
+recent_files: file:///dos/z/16/src/lib/lib_head.cpp
 recent_files: file:///dos/z/16/makefile
+recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/16/dos_gfx.h
 recent_files: file:///dos/z/16/16/dos_gfx.cpp
+recent_files: file:///dos/z/16/src/v2/source/ENGINE/CONTROLS.C
 snr_replacetype: 0
 savedir: file:///dos/z/16/src
 spell_check_default: 1
@@ -128,7 +129,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: MAPX/2
 searchlist: mapDrawTile
 searchlist: dxThresh
 searchlist: PalFile
@@ -143,6 +143,7 @@ searchlist: modexPalBlack(
 searchlist: fadePalette(
 searchlist: modexPalBlack(
 searchlist: modexPalUpdate
+searchlist: UnPress(
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
index 6ec5024..b1fd1a2 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ
index 76bc9f1..625aa7b 100644 (file)
-#include "src\lib\modex16.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "src\lib\dos_kb.h"
-#include "src\lib\wtest\wtest.c"
-
-//word far *clock= (word far*) 0x046C; /* 18.2hz clock */
-
-typedef struct {
-       bitmap_t *data;
-       word tileHeight;
-       word tileWidth;
-       unsigned int rows;
-       unsigned int cols;
-} tiles_t;
-
-
-typedef struct {
-       byte    *data;
-       tiles_t *tiles;
-       int width;
-       int height;
-} map_t;
-
-
-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;
-
-//TODO: make this into actor_t
-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
-       sword q; //loop variable
-       sword d; //direction
-       int hp; //hitpoints of the player
-} player;
-
-
-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);
+#include "src\lib\modex16.h"\r
+#include <stdio.h>\r
+#include <stdlib.h>\r
+#include "src\lib\dos_kb.h"\r
+#include "src\lib\wtest\wtest.c"\r
+\r
+//word far *clock= (word far*) 0x046C; /* 18.2hz clock */\r
+\r
+typedef struct {\r
+       bitmap_t *data;\r
+       word tileHeight;\r
+       word tileWidth;\r
+       unsigned int rows;\r
+       unsigned int cols;\r
+} tiles_t;\r
+\r
+\r
+typedef struct {\r
+       byte    *data;\r
+       tiles_t *tiles;\r
+       int width;\r
+       int height;\r
+} map_t;\r
+\r
+\r
+typedef struct {\r
+       map_t *map;\r
+       page_t *page;\r
+       int tx; //appears to be the top left tile position on the viewable screen map\r
+       int ty; //appears to be the top left tile position on the viewable screen map\r
+       word dxThresh; //????\r
+       word dyThresh; //????\r
+} map_view_t;\r
+\r
+//TODO: make this into actor_t\r
+struct {\r
+       int x; //player exact position on the viewable map\r
+       int y; //player exact position on the viewable map\r
+       int tx; //player tile position on the viewable map\r
+       int ty; //player tile position on the viewable map\r
+       int triggerx; //player's trigger box tile position on the viewable map\r
+       int triggery; //player's trigger box tile position on the viewable map\r
+       sword q; //loop variable\r
+       sword d; //direction\r
+       int hp; //hitpoints of the player\r
+} player;\r
+\r
+\r
+map_t allocMap(int w, int h);\r
+void initMap(map_t *map);\r
+void mapScrollRight(map_view_t *mv, byte offset);\r
+void mapScrollLeft(map_view_t *mv, byte offest);\r
+void mapScrollUp(map_view_t *mv, byte offset);\r
+void mapScrollDown(map_view_t *mv, byte offset);\r
+void mapGoTo(map_view_t *mv, int tx, int ty);\r
+void mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y);\r
+void mapDrawRow(map_view_t *mv, int tx, int ty, word y);\r
 void mapDrawCol(map_view_t *mv, int tx, int ty, word x);
-void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);
-
-#define TILEWH 16
-#define QUADWH (TILEWH/4)
-#define SPEED 4
-//#define LOOPMAX (TILEWH/SPEED)
-
-//place holder definitions
-#define MAPX 200
-#define MAPY 150
-#define TRIGGX 10
-#define TRIGGY 9
-//#define SWAP(a, b) tmp=a; a=b; b=tmp;
-void main() {
-       bitmap_t ptmp; // player sprite
-       //word q=1;
-       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 *pal;
+sword dpad(sword keypressed);\r
+void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp);\r
+\r
+#define TILEWH 16\r
+#define QUADWH (TILEWH/4)\r
+#define SPEED 4\r
+//#define LOOPMAX (TILEWH/SPEED)\r
+\r
+//place holder definitions\r
+#define MAPX 200\r
+#define MAPY 150\r
+#define TRIGGX 10\r
+#define TRIGGY 9\r
+//#define SWAP(a, b) tmp=a; a=b; b=tmp;\r
+void main() {\r
+       bitmap_t ptmp; // player sprite\r
+       const char *cpus;\r
+       static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */\r
+       page_t screen, screen2, screen3;\r
+       map_t map;\r
+       map_view_t mv, mv2, mv3;\r
+       map_view_t *bg, *spri, *mask;//, *tmp;\r
+       byte *pal;\r
        byte *ptr;
-
-       player.q=1;
-       player.d=0;
-
+       sword keypressed = 0;\r
+\r
+       player.q=1;\r
+       player.d=0;\r
+\r
        /* save the palette */\r
        pal  = modexNewPal();\r
        modexPalSave(pal);\r
        modexFadeOff(4, pal);\r
-       modexPalBlack();
-
-       /* create the map */
-       map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly
-       initMap(&map);
-       mv.map = &map;
-       mv2.map = &map;
-       mv3.map = &map;
-
-       /* draw the tiles */
-       ptr = map.data;
-       /*data\\*/
-       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite
-       setkb(1);
-       modexEnter();
-       modexPalBlack();
-       modexPalUpdate(ptmp.palette);
-       modexFadeOn(4, ptmp.palette);
-       screen = modexDefaultPage();
-       screen.width += (TILEWH*2);
-       screen.height += (TILEWH*2)+QUADWH;
-       mv.page = &screen;
-       screen2 = modexNextPage(mv.page);
-       mv2.page = &screen2;
-       screen3 = screen2;
-       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;
-       //TODO: erase player initial draw
-       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);
-       //temp draw trigger box
-       modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
-       modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);
-       modexShowPage(spri->page);
-       while(!keyp(1))
-       {
-       //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
-
-
-       //TODO: make this better
-       if(keyp(77) && !keyp(75) && player.q == 1) player.d = 2;
-       if(keyp(75) && !keyp(77)  && player.q == 1) player.d = 4;
-       if(keyp(80) && !keyp(72) && player.q == 1) player.d = 3;
-       if(keyp(72) && !keyp(80)  && player.q == 1) player.d = 1;
-       //if(player.d>0) player.q=1;
-
-       #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;
-
-       if(player.d == 2)
-       {
-               if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 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 < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 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;
-       }
-
-       if(player.d == 4)
-       {
-               if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 3, 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 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 3, 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;
-       }
-
-       if(player.d == 3)
-       {
-               if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 2, 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 < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 2, 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;
-       }
-
-       if(player.d == 1)
-       {
-               if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 0, 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 && !(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))
-               {
-                       //for(q=1; q<=(TILEWH/SPEED); q++)
-                       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, 0, 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;
-       }
-       //modexClearRegion(mask->page, 66, 66, 2, 40, 0);
-
-       if((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(KEY_ENTER))
-       {
-               short i;
-               for(i=600; i>=400; i--)
-               {
-                       sound(i);
-               }
-               nosound();
-       }
-       }
-
+       modexPalBlack();\r
+\r
+       /* create the map */\r
+       map = allocMap(MAPX,MAPY); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
+       initMap(&map);\r
+       mv.map = &map;\r
+       mv2.map = &map;\r
+       mv3.map = &map;\r
+\r
+       /* draw the tiles */\r
+       ptr = map.data;\r
+       /*data\\*/\r
+       ptmp = bitmapLoadPcx("ptmp.pcx"); // load sprite\r
+       setkb(1);\r
+       modexEnter();\r
+       modexPalBlack();\r
+       modexPalUpdate(ptmp.palette);\r
+       modexFadeOn(4, ptmp.palette);\r
+       screen = modexDefaultPage();\r
+       screen.width += (TILEWH*2);\r
+       screen.height += (TILEWH*2)+QUADWH;\r
+       mv.page = &screen;\r
+       screen2 = modexNextPage(mv.page);\r
+       mv2.page = &screen2;\r
+       screen3 = screen2;\r
+       mv3.page = &screen3;\r
+\r
+       /* set up paging */\r
+       bg = &mv;\r
+       spri = &mv2;\r
+       mask = &mv3;\r
+\r
+//TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
+       mapGoTo(bg, 0, 0);\r
+       mapGoTo(spri, 0, 0);\r
+       //mapGoTo(mask, 0, 0);\r
+\r
+       //TODO: put player in starting position of spot\r
+       //default player position on the viewable map\r
+       player.tx = bg->tx + 10;\r
+       player.ty = bg->ty + 8;\r
+       player.x = player.tx*TILEWH;\r
+       player.y = player.ty*TILEWH;\r
+       player.triggerx = player.tx;\r
+       player.triggery = player.ty+1;\r
+       //TODO: erase player initial draw\r
+       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
+       //temp draw trigger box\r
+       modexClearRegion(spri->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
+       modexClearRegion(bg->page, player.triggerx*16, player.triggery*16, 16, 16, 1);\r
+       modexShowPage(spri->page);\r
+       while(!keyp(1))\r
+       {\r
+       //top left corner & bottem right corner of map veiw be set as map edge trigger since maps are actually square\r
+       //to stop scrolling and have the player position data move to the edge of the screen with respect to the direction\r
+       //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\r
+\r
+\r
+       //TODO: make this better like rpg maker 2000 better
+       if(player.q == 1)
+       {\r
+               dpad(keypressed);
+               //if(keypressed>1){ keypressed=0; dpad(keypressed); }
+               keypressed = 0;
+       }\r
+\r
+       #define INC_PER_FRAME if(player.q&1) persist_aniframe++; if(persist_aniframe>4) persist_aniframe = 1;\r
+\r
+       if(player.d == 2)\r
+       {\r
+               if(bg->tx >= 0 && bg->tx+20 < MAPX && player.tx == bg->tx + 10 && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               //animatePlayer(bg, spri, mask, 1, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 1, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               mapScrollRight(bg, SPEED);\r
+                               mapScrollRight(spri, SPEED);\r
+                               //mapScrollRight(mask, SPEED);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.tx++; }\r
+               }\r
+               else if(player.tx < MAPX && !(player.tx+1 == TRIGGX && player.ty == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               player.x+=SPEED;\r
+                               //animatePlayer(bg, spri, mask, 1, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 1, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.tx++; }\r
+               }\r
+               else\r
+               {\r
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 32, 24, 32, &ptmp);\r
+                       modexShowPage(spri->page);\r
+                       player.d = 0;\r
+               }\r
+               player.triggerx = player.tx+1;\r
+               player.triggery = player.ty;\r
+       }\r
+\r
+       if(player.d == 4)\r
+       {\r
+               if(bg->tx > 0 && bg->tx+20 <= MAPX && player.tx == bg->tx + 10 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               //animatePlayer(bg, spri, mask, 3, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 3, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               mapScrollLeft(bg, SPEED);\r
+                               mapScrollLeft(spri, SPEED);\r
+                               //mapScrollLeft(mask, SPEED);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.tx--; }\r
+               }\r
+               else if(player.tx > 1 && !(player.tx-1 == TRIGGX && player.ty == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               player.x-=SPEED;\r
+                               //animatePlayer(bg, spri, mask, 3, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 3, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.tx--; }\r
+               }\r
+               else\r
+               {\r
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 96, 24, 32, &ptmp);\r
+                       modexShowPage(spri->page);\r
+                       player.d = 0;\r
+               }\r
+               player.triggerx = player.tx-1;\r
+               player.triggery = player.ty;\r
+       }\r
+\r
+       if(player.d == 3)\r
+       {\r
+               if(bg->ty >= 0 && bg->ty+15 < MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               //animatePlayer(bg, spri, mask, 2, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 2, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               mapScrollDown(bg, SPEED);\r
+                               mapScrollDown(spri, SPEED);\r
+                               //mapScrollDown(mask, SPEED);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.ty++; }\r
+               }\r
+               else if(player.ty < MAPY && !(player.tx == TRIGGX && player.ty+1 == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               player.y+=SPEED;\r
+                               //animatePlayer(bg, spri, mask, 2, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 2, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.ty++; }\r
+               }\r
+               else\r
+               {\r
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 64, 24, 32, &ptmp);\r
+                       modexShowPage(spri->page);\r
+                       player.d = 0;\r
+               }\r
+               player.triggerx = player.tx;\r
+               player.triggery = player.ty+1;\r
+       }\r
+\r
+       if(player.d == 1)\r
+       {\r
+               if(bg->ty > 0 && bg->ty+15 <= MAPY && player.ty == bg->ty + 8 && !(player.tx == TRIGGX && player.ty-1 == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               //animatePlayer(bg, spri, mask, 0, 1, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               animatePlayer(bg, spri, 0, 1, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               mapScrollUp(bg, SPEED);\r
+                               mapScrollUp(spri, SPEED);\r
+                               //mapScrollUp(mask, SPEED);\r
+                               modexShowPage(spri->page);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.ty--; }\r
+               }\r
+               else if(player.ty > 1 && !(player.tx == TRIGGX &&  player.ty-1 == TRIGGY))\r
+               {\r
+                       //for(q=1; q<=(TILEWH/SPEED); q++)\r
+                       if(player.q<=(TILEWH/SPEED))\r
+                       {\r
+                               INC_PER_FRAME;\r
+                               player.y-=SPEED;\r
+                               //animatePlayer(bg, spri, mask, 0, 0, player.x, player.y, persist_aniframe, q, &ptmp);\r
+                               modexShowPage(spri->page);\r
+                               animatePlayer(bg, spri, 0, 0, player.x, player.y, persist_aniframe, player.q, &ptmp);\r
+                               player.q++;\r
+                       } else { player.q = 1; player.d = 0; player.ty--; }\r
+               }\r
+               else\r
+               {\r
+                       modexCopyPageRegion(spri->page, bg->page, player.x-4, player.y-TILEWH, player.x-4, player.y-TILEWH, 24, 32);\r
+                       modexDrawSpriteRegion(spri->page, player.x-4, player.y-TILEWH, 24, 0, 24, 32, &ptmp);\r
+                       modexShowPage(spri->page);\r
+                       player.d = 0;\r
+               }\r
+               player.triggerx = player.tx;\r
+               player.triggery = player.ty-1;\r
+       }\r
+       //modexClearRegion(mask->page, 66, 66, 2, 40, 0);\r
+\r
+       if((player.triggerx == TRIGGX && player.triggery == TRIGGY) && keyp(KEY_ENTER))\r
+       {\r
+               short i;\r
+               for(i=600; i>=400; i--)\r
+               {\r
+                       sound(i);\r
+               }\r
+               nosound();\r
+       }\r
+       }\r
+\r
        /* fade back to text mode */\r
        modexFadeOff(4, ptmp.palette);\r
        modexPalBlack();\r
        modexLeave();\r
-       setkb(0);
-       printf("Project 16 scroll.exe\n");
-       printf("tx: %d\n", bg->tx);
-       printf("ty: %d\n", bg->ty);
-       printf("player.x: %d\n", player.x);
-       printf("player.y: %d\n", player.y);
-       printf("player.tx: %d\n", player.tx);
-       printf("player.ty: %d\n", player.ty);
-       printf("player.triggx: %d\n", player.triggerx);
-       printf("player.triggy: %d\n", player.triggery);
-       printf("player.q: %d\n", player.q);
-       printf("player.d: %d\n", player.d);
-       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("\n");
-       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);
+       setkb(0);\r
+       printf("Project 16 scroll.exe\n");\r
+       printf("tx: %d\n", bg->tx);\r
+       printf("ty: %d\n", bg->ty);\r
+       printf("player.x: %d\n", player.x);\r
+       printf("player.y: %d\n", player.y);\r
+       printf("player.tx: %d\n", player.tx);\r
+       printf("player.ty: %d\n", player.ty);\r
+       printf("player.triggx: %d\n", player.triggerx);\r
+       printf("player.triggy: %d\n", player.triggery);\r
+       printf("player.q: %d\n", player.q);\r
+       printf("player.d: %d\n", player.d);\r
+       printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");\r
+       printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");\r
+       printf("\n");\r
+       switch(detectcpu())\r
+       {\r
+               case 0: cpus = "8086/8088 or 186/88"; break;\r
+               case 1: cpus = "286"; break;\r
+               case 2: cpus = "386 or newer"; break;\r
+               default: cpus = "internal error"; break;\r
+       }\r
+       printf("detected CPU type: %s\n", cpus);\r
        modexPalBlack();\r
-       modexFadeOn(4, pal);
-}
-
-
-map_t
-allocMap(int w, int h) {
-       map_t result;
-
-       result.width =w;
-       result.height=h;
-       result.data = malloc(sizeof(byte) * w * h);
-
-       return result;
-}
-
-
-void
-initMap(map_t *map) {
-       /* just a place holder to fill out an alternating pattern */
-       int x, y;
-       int i;
-       int tile = 1;
-       map->tiles = malloc(sizeof(tiles_t));
-
-       /* create the tile set */
-       map->tiles->data = malloc(sizeof(bitmap_t));
-       map->tiles->data->width = (TILEWH*2);
-       map->tiles->data->height= TILEWH;
-       map->tiles->data->data = malloc((TILEWH*2)*TILEWH);
-       map->tiles->tileHeight = TILEWH;
-       map->tiles->tileWidth =TILEWH;
-       map->tiles->rows = 1;
-       map->tiles->cols = 2;
-
-       i=0;
-       for(y=0; y<TILEWH; y++) {
-       for(x=0; x<(TILEWH*2); x++) {
-               if(x<TILEWH)
-                 map->tiles->data->data[i] = 28;//0x24;
-               else
-                 map->tiles->data->data[i] = 0;//0x34;
-               i++;
-       }
-       }
-
-       i=0;
-       for(y=0; y<map->height; y++) {
-               for(x=0; x<map->width; x++) {
-                       map->data[i] = tile;
-                       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;
-       rx = (i % t->cols) * t->tileWidth;
-       ry = (i / t->cols) * 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
-animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp)
+       modexFadeOn(4, pal);\r
+}\r
+\r
+\r
+map_t\r
+allocMap(int w, int h) {\r
+       map_t result;\r
+\r
+       result.width =w;\r
+       result.height=h;\r
+       result.data = malloc(sizeof(byte) * w * h);\r
+\r
+       return result;\r
+}\r
+\r
+\r
+void\r
+initMap(map_t *map) {\r
+       /* just a place holder to fill out an alternating pattern */\r
+       int x, y;\r
+       int i;\r
+       int tile = 1;\r
+       map->tiles = malloc(sizeof(tiles_t));\r
+\r
+       /* create the tile set */\r
+       map->tiles->data = malloc(sizeof(bitmap_t));\r
+       map->tiles->data->width = (TILEWH*2);\r
+       map->tiles->data->height= TILEWH;\r
+       map->tiles->data->data = malloc((TILEWH*2)*TILEWH);\r
+       map->tiles->tileHeight = TILEWH;\r
+       map->tiles->tileWidth =TILEWH;\r
+       map->tiles->rows = 1;\r
+       map->tiles->cols = 2;\r
+\r
+       i=0;\r
+       for(y=0; y<TILEWH; y++) {\r
+       for(x=0; x<(TILEWH*2); x++) {\r
+               if(x<TILEWH)\r
+                 map->tiles->data->data[i] = 28;//0x24;\r
+               else\r
+                 map->tiles->data->data[i] = 0;//0x34;\r
+               i++;\r
+       }\r
+       }\r
+\r
+       i=0;\r
+       for(y=0; y<map->height; y++) {\r
+               for(x=0; x<map->width; x++) {\r
+                       map->data[i] = tile;\r
+                       tile = tile ? 0 : 1;\r
+                       i++;\r
+               }\r
+               tile = tile ? 0 : 1;\r
+       }\r
+}\r
+\r
+\r
+void\r
+mapScrollRight(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dx += offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dx >= mv->dxThresh ) {\r
+       /* go forward one tile */\r
+       mv->tx++;\r
+       /* Snap the origin forward */\r
+       mv->page->data += 4;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+       //}\r
+\r
+       /* draw the next column */\r
+       x= SCREEN_WIDTH + mv->map->tiles->tileWidth;\r
+               mapDrawCol(mv, mv->tx + 20 , mv->ty-1, x);\r
+       }\r
+}\r
+\r
+\r
+void\r
+mapScrollLeft(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dx -= offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dx == 0) {\r
+       /* go backward one tile */\r
+       mv->tx--;\r
+               \r
+       /* Snap the origin backward */\r
+       mv->page->data -= 4;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+       //}\r
+       /* draw the next column */\r
+               mapDrawCol(mv, mv->tx-1, mv->ty-1, 0);\r
+       }\r
+}\r
+\r
+\r
+void\r
+mapScrollUp(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dy -= offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dy == 0 ) {\r
+       /* go down one tile */\r
+       mv->ty--;\r
+       /* Snap the origin downward */\r
+       mv->page->data -= mv->page->width*4;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+       //}\r
+\r
+       /* draw the next row */\r
+       y= 0;\r
+               mapDrawRow(mv, mv->tx-1 , mv->ty-1, y);\r
+       }\r
+}\r
+\r
+\r
+void\r
+mapScrollDown(map_view_t *mv, byte offset) {\r
+       word x, y;  /* coordinate for drawing */\r
+\r
+       /* increment the pixel position and update the page */\r
+       mv->page->dy += offset;\r
+\r
+       /* check to see if this changes the tile */\r
+       if(mv->page->dy >= mv->dyThresh ) {\r
+       /* go down one tile */\r
+       mv->ty++;\r
+       /* Snap the origin downward */\r
+       mv->page->data += mv->page->width*4;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+       //}\r
+\r
+       /* draw the next row */\r
+       y= SCREEN_HEIGHT + mv->map->tiles->tileHeight;\r
+               mapDrawRow(mv, mv->tx-1 , mv->ty+15, y);\r
+       }\r
+\r
+}\r
+\r
+\r
+void\r
+mapGoTo(map_view_t *mv, int tx, int ty) {\r
+       int px, py;\r
+       unsigned int i;\r
+\r
+       /* set up the coordinates */\r
+       mv->tx = tx;\r
+       mv->ty = ty;\r
+       mv->page->dx = mv->map->tiles->tileWidth;\r
+       mv->page->dy = mv->map->tiles->tileHeight;\r
+\r
+       /* set up the thresholds */\r
+       mv->dxThresh = mv->map->tiles->tileWidth * 2;\r
+       mv->dyThresh = mv->map->tiles->tileHeight * 2;\r
+\r
+       /* draw the tiles */\r
+       modexClearRegion(mv->page, 0, 0, mv->page->width, mv->page->height, 0);\r
+       py=0;\r
+       i=mv->ty * mv->map->width + mv->tx;\r
+       for(ty=mv->ty-1; py < SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; ty++, py+=mv->map->tiles->tileHeight) {\r
+               mapDrawRow(mv, tx-1, ty, py);\r
+       i+=mv->map->width - tx;\r
+       }\r
+}\r
+\r
+\r
+void\r
+mapDrawTile(tiles_t *t, word i, page_t *page, word x, word y) {\r
+       word rx;\r
+       word ry;\r
+       rx = (i % t->cols) * t->tileWidth;\r
+       ry = (i / t->cols) * t->tileHeight;\r
+       modexDrawBmpRegion(page, x, y, rx, ry, t->tileWidth, t->tileHeight, t->data);\r
+}\r
+\r
+\r
+void \r
+mapDrawRow(map_view_t *mv, int tx, int ty, word y) {\r
+       word x;\r
+       int i;\r
+\r
+       /* the position within the map array */\r
+       i=ty * mv->map->width + tx;\r
+       for(x=0; x<SCREEN_WIDTH+mv->dxThresh && tx < mv->map->width; x+=mv->map->tiles->tileWidth, tx++) {\r
+       if(i>=0) {\r
+               /* we are in the map, so copy! */\r
+               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+       }\r
+       i++; /* next! */\r
+       }\r
+}\r
+\r
+void \r
+mapDrawCol(map_view_t *mv, int tx, int ty, word x) {\r
+       int y;\r
+       int i;\r
+\r
+       /* location in the map array */\r
+       i=ty * mv->map->width + tx;\r
+\r
+       /* We'll copy all of the columns in the screen, \r
+          i + 1 row above and one below */\r
+       for(y=0; y<SCREEN_HEIGHT+mv->dyThresh && ty < mv->map->height; y+=mv->map->tiles->tileHeight, ty++) {\r
+       if(i>=0) {\r
+               /* we are in the map, so copy away! */\r
+               mapDrawTile(mv->map->tiles, mv->map->data[i], mv->page, x, y);\r
+       }\r
+       i += mv->map->width;\r
+       }\r
+}\r
+
+sword
+dpad(sword keypressed)
 {
-       short dire=32*d1; //direction
-       short qq; //scroll offset
-
-       if(d2==0) qq = 0;
-       else qq = ((lp)*SPEED);
-       switch (d1)
-       {
-               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();
+       if(keyp(75) && !keyp(77)){ player.d = 4; keypressed++; }
+       if(keyp(80) && !keyp(72)){ player.d = 3; keypressed++; }
+       if(keyp(77) && !keyp(75)){ player.d = 2; keypressed++; }\r
+       if(keyp(72) && !keyp(80)){ player.d = 1; keypressed++; }
+       return keypressed;
 }
+\r
+void\r
+animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */short d1, short d2, int x, int y, int ls, int lp, bitmap_t *bmp)\r
+{\r
+       short dire=32*d1; //direction\r
+       short qq; //scroll offset\r
+\r
+       if(d2==0) qq = 0;\r
+       else qq = ((lp)*SPEED);\r
+       switch (d1)\r
+       {\r
+               case 0:\r
+                       //up\r
+                       x=x-4;\r
+                       y=y-qq-TILEWH;\r
+               break;\r
+               case 1:\r
+                       // right\r
+                       x=x+qq-4;\r
+                       y=y-TILEWH;\r
+               break;\r
+               case 2:\r
+                       //down\r
+                       x=x-4;\r
+                       y=y+qq-TILEWH;\r
+               break;\r
+               case 3:\r
+                       //left\r
+                       x=x-qq-4;\r
+                       y=y-TILEWH;\r
+               break;\r
+       }\r
+       modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);\r
+       if(2>ls && ls>=1) { modexDrawSpriteRegion(dest->page, x, y, 48, dire, 24, 32, bmp); }else\r
+       if(3>ls && ls>=2) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }else\r
+       if(4>ls && ls>=3) { modexDrawSpriteRegion(dest->page, x, y, 0, dire, 24, 32, bmp); }else\r
+       if(5>ls && ls>=4) { modexDrawSpriteRegion(dest->page, x, y, 24, dire, 24, 32, bmp); }\r
+       //TODO: mask copy //modexCopyPageRegion(dest->page, src->page, x-4, y-4, x-4, y-4, 28, 40);\r
+       //modexClearRegion(top->page, 66, 66, 2, 40, 0);\r
+       //modexCopyPageRegion(dest->page, top->page, 66, 66, 66, 66, 2, 40);\r
+       //turn this off if XT\r
+       if(detectcpu() > 0) modexWaitBorder();\r
+}\r