ok it works...... but not the graphical library....

	modified:   data/g.pal
	modified:   scroll.exe
	modified:   scroll.out
	modified:   src/scroll.c

diff --git a/data/g.pal b/data/g.pal
index 1119179f1d0af42f11c567bedea565b209623b71..a234f82cf8f66fa49d1057244aa661141c14cf8d 100644 (file)
Binary files a/data/g.pal and b/data/g.pal differ

diff --git a/scroll.exe b/scroll.exe
index 7d31cafacc3646d171ac3580625ec66e88cca076..eedd2c97e39fdfed2b7e5cf369c4a090003d3752 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/scroll.out b/scroll.out
index b95a9611de923753f1c4c5ad3eb7623bed40c33b..39e4f9ede54f0158d8c0486ac2bd0a2e02a5c0b3 100644 (file)
--- a/scroll.out
+++ b/scroll.out
@@ -4,9 +4,74 @@ qqqqqqqq
 \r
 qqqqqqqq\r
 \r
+chkcolor start~\r
+1                              (*z): 0\r
+1                              (*i): 39\r
+wwwwwwwwwwwwwwww\r
+!!                                     a[30]: 0\r
+!!                                     a[31]: 11\r
+!!                                     a[38]: 28\r
+wwwwwwwwwwwwwwww\r
+2                              (*z): 39\r
+2                              (*i): 39\r
+chkcolor end~\r
+p[]=0  qp=90   p[]-qp=90\r
+p[]=1  qp=90   p[]-qp=91\r
+p[]=2  qp=90   p[]-qp=92\r
+               90's color=3\r
+               91's color=3\r
+               92's color=3\r
+\r
+qqqqqqqq\r
+\r
+p[]=0  qp=93   p[]-qp=93\r
+p[]=1  qp=93   p[]-qp=94\r
+p[]=2  qp=93   p[]-qp=95\r
+p[]=3  qp=93   p[]-qp=96\r
+p[]=4  qp=93   p[]-qp=97\r
+p[]=5  qp=93   p[]-qp=98\r
+               93's color=39\r
+               94's color=39\r
+               95's color=39\r
+\r
+qqqqqqqq\r
+\r
+p[]=0  qp=114  p[]-qp=114\r
+p[]=1  qp=114  p[]-qp=115\r
+p[]=2  qp=114  p[]-qp=116\r
+p[]=3  qp=114  p[]-qp=117\r
+p[]=4  qp=114  p[]-qp=118\r
+p[]=5  qp=114  p[]-qp=119\r
+p[]=6  qp=114  p[]-qp=120\r
+p[]=7  qp=114  p[]-qp=121\r
+p[]=8  qp=114  p[]-qp=122\r
+p[]=9  qp=114  p[]-qp=123\r
+p[]=10 qp=114  p[]-qp=124\r
+p[]=11 qp=114  p[]-qp=125\r
+p[]=12 qp=114  p[]-qp=126\r
+p[]=13 qp=114  p[]-qp=127\r
+p[]=14 qp=114  p[]-qp=128\r
+p[]=15 qp=114  p[]-qp=129\r
+p[]=16 qp=114  p[]-qp=130\r
+p[]=17 qp=114  p[]-qp=131\r
+p[]=18 qp=114  p[]-qp=132\r
+p[]=19 qp=114  p[]-qp=133\r
+p[]=20 qp=114  p[]-qp=134\r
+p[]=21 qp=114  p[]-qp=135\r
+p[]=22 qp=114  p[]-qp=136\r
+p[]=23 qp=114  p[]-qp=137\r
+p[]=24 qp=114  p[]-qp=138\r
+p[]=25 qp=114  p[]-qp=139\r
+p[]=26 qp=114  p[]-qp=140\r
+               114's color=111\r
+               115's color=111\r
+               116's color=111\r
+\r
+qqqqqqqq\r
+\r
 \r
 ====\r
-0      paloffset=      10\r
+0      paloffset=      38\r
 ====\r
 \r
 i=1\r
@@ -661,9 +726,9 @@ player.tx: 10               player.ty: 8
 player.triggx: 10      player.triggy: 9\r
 player.hp: 4   player.q: 1     player.d: 0\r
 tile data value at player trigger position: 0\r
-palette offset:        10\r
-Total used: 32328\r
-Total free: 25816\r
+palette offset:        38\r
+Total used: 51566\r
+Total free: 6562\r
 temporary player sprite 0: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=45556867\r
 temporary player sprite 1: http://www.pixiv.net/member_illust.php?mode=medium&illust_id=44606385\r
 Screen: 352x280\r

diff --git a/src/scroll.c b/src/scroll.c
index 93cc5d967cb835d5d3cb42d4b921100fa377e92b..70875da1fa8f7f9e09bb0d4662c4253f7145d598 100644 (file)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,31 +1,11 @@
 #include "src/lib/dos_kb.h"\r
 #include "src/lib/mapread.h"\r
-//#include "16\lib\x\modex.h"\r
 #include "src/lib/wtest/wtest.c"\r
 #include "src/lib/planar.c"\r
 //====#include "src\lib\ems.c"\r
 
-//#define LOADDATA
-\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
@@ -72,8 +52,8 @@ void animatePlayer(map_view_t *src, map_view_t *dest, /*map_view_t *top, */sword
 //place holder definitions\r
 //#define MAPX 200\r
 //#define MAPY 150\r
-#define TRIGGX 10\r
-#define TRIGGY 9\r
+//#define TRIGGX 10\r
+//#define TRIGGY 9\r
 \r
 void main() {\r
        size_t oldfreemem=GetFreeSize();\r
@@ -126,11 +106,9 @@ void main() {
 \r
        /* create the map */\r
 //0000 printf("Total used @ before map load:                   %zu\n", oldfreemem-GetFreeSize());
-//0000 #ifdef LOADDATA
 //0000 fprintf(stderr, "testing~\n");
        loadmap("data/test.map", &map);
 //0000 fprintf(stderr, "yay map loaded~~\n");
-//0000 #endif\r
 //---- map = allocMap(map.width,map.height); //20x15 is the resolution of the screen you can make maps smaller than 20x15 but the null space needs to be drawn properly\r
        //if(isEMS()) printf("%d tesuto\n", coretotalEMS());\r
 //---- initMap(&map);\r
@@ -143,16 +121,12 @@ void main() {
        mappalptr = map.tiles->data->palette;\r
        /* data */\r
 //0000 printf("Total used @ before image loading:              %zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA\r
        ptmp = bitmapLoadPcx("data/ptmp.pcx"); // load sprite
-#endif\r
        //npctmp = bitmapLoadPcx("ptmp1.pcx"); // load sprite\r
        \r
        /* create the planar buffer */\r
 //0000 printf("Total used @ before planar buffer creation:     %zu\n", oldfreemem-GetFreeSize());
-#ifdef LOADDATA\r
        p = planar_buf_from_bitmap(&ptmp);
-#endif\r
 //0000 printf("Total used @ after planar buffer creation:      %zu\n", oldfreemem-GetFreeSize());\r
 \r
        /*if(isEMS())\r