]> 4ch.mooo.com Git - 16.git/blobdiff - src/scroll.c
use write sequencer function
[16.git] / src / scroll.c
old mode 100644 (file)
new mode 100755 (executable)
index 21fd76d..d5222a5
-#include "src\lib\modex16.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include "src\lib\dos_kb.h"
-#include "src\lib\wtest\wtest.c"
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "src/lib/scroll16.h"
+#include "src/lib/16_timer.h"
+#include "src/lib/wcpu/wcpu.h"
+
+//#define FADE
+#define MODEX  //this is for mode x initiating
 
 //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;
-
+global_game_variables_t gvar;
+static map_t map;
+player_t player[MaxPlayers];
+//page_t screen, gvar.video.page[1], gvar.video.page[2];
+map_view_t mv[3];
+map_view_t *bg, *spri, *mask;//, *tmp;
+bitmap_t p;
+word pn=0;
+static planar_buf_t huge *pp;
+float t;
+sword bakapee;
+
+//     word panswitch=0, panq=1, pand=0;
+       word panpagenum=0; //for panning!
+       unsigned int i;
+       const char *cpus;
+       //static int persist_aniframe = 0;    /* gonna be increased to 1 before being used, so 0 is ok for default */
+
+       //map_view_db_t pgid[4];
+       word pg;
+//#ifdef FADE
+       static word paloffset=0;
+       byte *dpal, *default_pal;
+//#endif
+       byte *gpal;
+       byte *ptr;
+       byte *mappalptr;
 
-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;
+void main(int argc, char *argv[])
+{
+       byte *mesg=malloc(sizeof(dword));
 
-//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;
+       if(argv[1]) bakapee = atoi(argv[1]);
+       else bakapee = 1;
 
+       testcontrolnoisy=0;
 
-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 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);
+       player[0].persist_aniframe=0;
+       player[0].speed=4;
+       //player[0].data = &pp;
 
-#define TILEWH 16
-#define QUADWH (TILEWH/4)
-#define SPEED 4
-//#define LOOPMAX (TILEWH/SPEED)
+       printf("starting timer  ");
+       start_timer(&gvar);
+       printf("ok\n");
 
-//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;
-       byte *ptr;
-
-       player.q=1;
-       player.d=0;
-
-       /* save the palette */\r
-       pal  = modexNewPal();\r
-       modexPalSave(pal);\r
-       modexFadeOff(4, pal);\r
-       modexPalBlack();
+//     atexit(qclean());
 
        /* 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;
+       fprintf(stderr, "testing map load~      ");
+       loadmap("data/test.map", &map);
+       chkmap(&map, 0);
+       printf("chkmap ok       ");
+       fprintf(stderr, "yay map loaded~~\n");
+       mv[0].map = &map;
+       mv[1].map = &map;
+       mv[2].map = &map;
 
        /* draw the tiles */
+#ifdef MODEX
        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;
+       //mappalptr = map.tiles->btdata->palette;
+
+       /* data */
+       p = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
+       //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite
+
+       /* create the planar buffer */
+////++++       (player[0].data) = *planar_buf_from_bitmap(&p);
+       printf("load pee!!      ");
+       pp = planar_buf_from_bitmap(&p);
+       printf("done!\n");
+
+#endif
+       /*      input!  */
+       IN_Startup();
+       IN_Default(0,&player,ctrl_Joystick);
+
+       /* save the palette */
+#ifdef MODEX
+#ifdef FADE
+       dpal = modexNewPal();
+       default_pal = modexNewPal();
+       *default_pal = *dpal;
+       modexPalSave(dpal);
+       modexFadeOff(4, dpal);
+#endif
+
+       textInit();
+       VGAmodeX(bakapee, 1, &gvar);
+//     printf("%dx%d\n", gvar.video.page[0].sw, gvar.video.page[0].sh);
+#ifdef FADE
+       modexPalBlack();        //reset the palette~
+#endif
+#endif
+//     printf("Total used @ before palette initiation:         %zu\n", oldfreemem-GetFreeSize());
+//++++ player[0].data.offset=(paloffset/3);
+//++++ modexPalUpdate1(&player[0].data, &paloffset, 0, 0);
+               //modexPalUpdate1(p.palette);
+               modexPalUpdate1(map.tiles->btdata->palette);
+       //printf("      %d\n", sizeof(ptmp->data));
+       //printf("1:    %d\n", paloffset);
+//++++ map.tiles->data->offset=(paloffset/3);
+       //XTmodexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+//     printf("\n====\n");
+//     printf("0       paloffset=      %d\n", paloffset/3);
+//     printf("====\n\n");
+#ifdef MODEX
+#ifdef FADE
+       gpal = modexNewPal();
+       modexPalSave(gpal);
+       modexSavePalFile("data/g.pal", gpal);
+       modexPalBlack();        //so player will not see loadings~
+#endif
+#endif
+
+       /* setup camera and screen~ */
+       gvar.video.page[0] = modexDefaultPage(&gvar.video.page[0]);
+       gvar.video.page[0].width += (TILEWH*2);
+       gvar.video.page[0].height += (TILEWH*2);//+QUADWH;
+       mv[0].page = &gvar.video.page[0];
+       gvar.video.page[1] = modexNextPage(mv[0].page);
+       mv[1].page = &gvar.video.page[1];
+
+       gvar.video.page[2] = modexNextPageFlexibleSize(mv[1].page, gvar.video.page[0].sw, gvar.video.page[0].sh);       //(352*176)+1024 is the remaining amount of memory left wwww
+       //gvar.video.page[2] = modexNextPage0(mv2.page, 320, 192);      //(352*176)+1024 is the remaining amount of memory left wwww
+       mv[2].page = &gvar.video.page[2];
 
        /* set up paging */
-       bg = &mv;
-       spri = &mv2;
-       mask = &mv3;
-
+       bg = &mv[0];
+       spri = &mv[1];
+       mask = &mv[2];
+//IN_Ack();
 //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);
-
+//IN_Ack();
        //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);
+       player[0].tx = bg->tx + bg->page->tilemidposscreenx;
+       player[0].ty = bg->ty + bg->page->tilemidposscreeny;
+       player[0].x = player[0].tx*TILEWH;
+       player[0].y = player[0].ty*TILEWH;
+       player[0].triggerx = player[0].tx;
+       player[0].triggery = player[0].ty+1;
+/*     player[0].info.x = player[0].tx;
+       player[0].info.xaxis = player[0].tx*TILEWH;
+       player[0].info.y = player[0].ty;
+       player[0].info.yaxis = player[0].ty*TILEWH;*/
+       player[0].q=1;
+       player[0].d=2;
+       player[0].hp=4;
+//     player[0].persist_aniframe=0;
+       //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);*/
+
+       modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[0].page->width, mv[0].page->height);
+#ifndef        SPRITE
+       modexClearRegion(mv[1].page, player[0].x-4, player[0].y-TILEWH, 24, 32, 15);
+#else
+       //PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32,       PLAYERBMPDATA);
+       PBUFSFUN(spri->page, player[0].x-4, player[0].y-TILEWH, 24, 64, 24, 32, &pp);
+#endif
+
        modexShowPage(spri->page);
-       while(!keyp(1))
+       //modexClearRegion(mv[2].page, 0, 0, mv[2].page->width, mv[2].page->height, 1);
+#ifdef MODEX
+#ifdef FADE
+       modexFadeOn(4, gpal);
+#endif
+#endif
+       while(!IN_KeyDown(sc_Escape) && player[0].hp>0)
        {
+               shinku(mv, &gvar);
+               IN_ReadControl(0,&player);
        //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(72) && !keyp(80)  && player.q == 1) player.d = 1;
-       if(keyp(77) && !keyp(75) && player.q == 1) player.d = 2;
-       if(keyp(80) && !keyp(72) && player.q == 1) player.d = 3;
-       if(keyp(75) && !keyp(77)  && player.q == 1) player.d = 4;
-       //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)
+       //when player[0].tx or player[0].ty == 0 or player[0].tx == 20 or player[0].ty == 15 then stop because that is edge of map and you do not want to walk of the map
+
+       //player movement
+       //if(!panswitch){
+               walk(mv, player, 0);
+       /*}else{
+//88 switch!
+       //right movement
+       if((IN_KeyDown(77) && !IN_KeyDown(75) && pand == 0) || pand == 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))
+               if(pand == 0){ pand = 2; }
+                       if(panq<=(TILEWH/(player[0].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;
+                               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; }
        }
-
-       if(player.d == 4)
+       //left movement
+       if((IN_KeyDown(75) && !IN_KeyDown(77) && pand == 0) || pand == 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))
+               if(pand == 0){ pand = 4; }
+                       if(panq<=(TILEWH/(player[0].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;
+                               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; }
        }
-
-       if(player.d == 3)
+       //down movement
+       if((IN_KeyDown(72) && !IN_KeyDown(80) && pand == 0) || pand == 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))
+               if(pand == 0){ pand = 3; }
+                       if(panq<=(TILEWH/(player[0].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))
+                               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((IN_KeyDown(80) && !IN_KeyDown(72) && pand == 0) || pand == 1)
+       {
+               if(pand == 0){ pand = 1; }
+                       if(panq<=(TILEWH/(player[0].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;
+                               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; }
        }
+}*/
+
 
-       if(player.d == 1)
+       //the scripting stuf....
+
+       //if(((player[0].triggerx == TRIGGX && player[0].triggery == TRIGGY) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
+       if(((bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))] == 0) && IN_KeyDown(0x1C))||(player[0].tx == 5 && player[0].ty == 5))
        {
-               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))
+               short i;
+               for(i=800; i>=400; i--)
                {
-                       //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--; }
+                       sound(i);
                }
-               else
+               nosound();
+       }
+       if(player[0].q == (TILEWH/(player[0].speed))+1 && player[0].info.dir != 2 && (player[0].triggerx == 5 && player[0].triggery == 5)){ player[0].hp--; }
+       //debugging binds!
+       //if(IN_KeyDown(0x0E)) while(1){ if(xmsmalloc(24)) break; }
+       if(IN_KeyDown(2)){ modexShowPage(bg->page); panpagenum=0; }
+       if(IN_KeyDown(3)){ modexShowPage(spri->page); panpagenum=1; }
+       if(IN_KeyDown(4)){ modexShowPage(mask->page); panpagenum=2; }
+       if(IN_KeyDown(25)){ pdump(bg->page); pdump(spri->page); }       //p
+#ifdef MODEX
+#ifdef FADE
+       if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; pdump(bg->page); pdump(spri->page); }
+       if(IN_KeyDown(22)){
+       paloffset=0; modexPalBlack(); modexPalUpdate(&player[0].data, &paloffset, 0, 0);
+       printf("1paloffset      =       %d\n", paloffset/3);
+        modexPalUpdate(map.tiles->data, &paloffset, 0, 0);
+       printf("2paloffset      =       %d\n", paloffset/3);
+        pdump(bg->page); pdump(spri->page); }
+#endif
+#endif
+       //pan switch
+       //if(IN_KeyDown(88)){if(!panswitch) panswitch++; else panswitch--; }    //f12
+       //TSR
+       if(IN_KeyDown(87))      //f11
+       {
+               VGAmodeX(0, 0, &gvar);
+               IN_Shutdown();
+               __asm
                {
-                       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;
+                       mov ah,31h
+                       int 21h
                }
-               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))
+       if(IN_KeyDown(88))      //s
        {
-               short i;
-               for(i=600; i>=400; i--)
+               switch(gvar.kurokku.fpscap)
                {
-                       sound(i);
+                       case 0:
+                               gvar.kurokku.fpscap=1;
+                       break;
+                       case 1:
+                               gvar.kurokku.fpscap=0;
+                       break;
                }
-               nosound();
+               IN_Ack();
+       }
+       //TODO fmemtest into page
+       if(IN_KeyDown(4+1))     //4
+       {
+               pg=1;
+               SELECT_ALL_PLANES();
+               _fmemset(((mv[pg].page->data+4)+(16*(mv[pg].page->width/4))), 15, 4);
        }
+
+       //9
+       if(IN_KeyDown(10)){ modexPalOverscan(default_pal, rand()%56); modexPalUpdate1(default_pal); }
+       //if(IN_KeyDown(11)){ modexPalOverscan(default_pal, 15); }
+       if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!
        }
 
-       /* fade back to text mode */\r
-       modexFadeOff(4, ptmp.palette);\r
-       modexPalBlack();\r
-       modexLeave();\r
-       setkb(0);
-       printf("Project 16 scroll.exe\n");
+       /* fade back to text mode */
+       /* but 1st lets save the game palette~ */
+#ifdef MODEX
+#ifdef FADE
+       modexPalSave(gpal);
+       modexSavePalFile("data/g.pal", gpal);
+       modexFadeOff(4, gpal);
+#endif
+       VGAmodeX(0, 1, &gvar);
+#endif
+       IN_Shutdown();
+       printf("Project 16 scroll.exe. This is just a test file!\n");
+       printf("version %s\n", VERSION);
        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");
+       printf("player[0].x: %d", player[0].x); printf("                player[0].y: %d\n", player[0].y);
+       //if(player[0].hp==0) printf("%d wwww\n", player[0].y+8);
+       //else printf("\nplayer[0].y: %d\n", player[0].y);
+       printf("player[0].tx: %d", player[0].tx); printf("              player[0].ty: %d\n", player[0].ty);
+       printf("player[0].triggx: %d", player[0].triggerx); printf("    player[0].triggy: %d\n", player[0].triggery);
+       printf("player[0].hp: %d", (player[0].hp));     printf("        player[0].q: %d", player[0].q); printf("        player[0].info.dir: %d", player[0].info.dir);   printf("        player[0].d: %d\n", player[0].d);
+               printf("pdir=%d\n", player[0].pdir);
+       printf("tile data value at player trigger position: %d\n", bg->map->data[(player[0].triggerx-1)+(map.width*(player[0].triggery-1))]);
+//     printf("palette offset: %d\n", paloffset/3);
+//++++ printf("Total used: %zu\n", oldfreemem-GetFreeSize());
+//++++ printf("Total free: %zu\n", GetFreeSize());
+//not used now printf("temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\n");
+//not used now printf("temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\n");
+       printf("Virtual Screen: %dx", gvar.video.page[0].width);        printf("%d\n", gvar.video.page[0].height);
+       printf("Screen: %dx", gvar.video.page[0].sw);   printf("%d\n", gvar.video.page[0].sh);
+       printf("tile resolution: %dx", gvar.video.page[0].tilesh);      printf("%d\n", gvar.video.page[0].tilesh);
+       printf("middle tile position: %dx", gvar.video.page[0].tilemidposscreenx);      printf("%d\n", gvar.video.page[0].tilemidposscreeny);
+//     printf("Screen2: %dx", gvar.video.page[1].width);       printf("%d\n", gvar.video.page[1].height);
+//     printf("map: %dx%d\n", map.width, map.height);
+//     printf("\n");
+//     printf("player[0].info.x: %d", player[0].info.xaxis); printf("          player[0].info.y: %d\n", player[0].info.yaxis);
+//     printf("player[0].info.tx: %d", player[0].info.x); printf("             player[0].info.ty: %d\n", player[0].info.y);
+       //printf("map.width=%d  map.height=%d   map.data[0]=%d\n", bg->map->width, bg->map->height, bg->map->data[0]);
+
        switch(detectcpu())
        {
                case 0: cpus = "8086/8088 or 186/88"; break;
@@ -358,266 +449,9 @@ void main() {
                default: cpus = "internal error"; break;
        }
        printf("detected CPU type: %s\n", cpus);
-       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)
-{
-       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();
+#ifdef MODEX
+#ifdef FADE
+       modexFadeOn(4, dpal);
+#endif
+#endif
 }