things are working well now ^o^

diff --git a/src/lib/modex16.c b/src/lib/modex16.c
index fe997dd741b8a7853c29465064de95b1fc396230..9b61ed8ba4bb1f8d0bd0707cf5f0077d6a930eab 100755 (executable)
--- a/src/lib/modex16.c
+++ b/src/lib/modex16.c
@@ -259,9 +259,9 @@ void modexHiganbanaPageSetup(video_t *video)
 {\r
        video->vmem_remain=262144L;\r
        video->num_of_pages=0;\r
-       (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++;\r
-       //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);\r
+       (video->page[0]) = modexDefaultPage(&(video->page[0])); video->num_of_pages++;  //video->page[0].width += (TILEWHD); video->page[0].height += (TILEWHD);\r
        (video->page[1]) = modexNextPage(&(video->page[0]));    video->num_of_pages++;\r
+       (video->page[2]) = modexNextPage(&(video->page[1]));    video->num_of_pages++;\r
        //(video->page[2]) = modexNextPageFlexibleSize(&(video->page[1]), video->page[0].width, video->page[0].sh-40);  video->num_of_pages++;\r
        //(video->page[3]) = modexNextPageFlexibleSize(&(video->page[2]), TILEWH, TILEWH);      video->num_of_pages++;\r
        modexCalcVmemRemain(video);\r
@@ -1119,9 +1119,9 @@ modexWaitBorder() {
        // spin\r
     }\r
 \r
-    while(!(inp(INPUT_STATUS_1)  & 8))  {\r
-       // spin\r
-    }\r
+//     while(!(inp(INPUT_STATUS_1)  & 8))  {\r
+//     // spin\r
+//     }\r
 }\r
 \r
 void bios_cls() {\r

diff --git a/src/scroll.c b/src/scroll.c
index f371f87d1d3ddd494ddf23f4829ec404218788a7..66a163d67ba2ddcc0e2391169fd442359c8071eb 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -162,7 +162,7 @@ void main(int argc, char *argv[])
 
        /* setup camera and screen~ */
        modexHiganbanaPageSetup(&gvar.video);
-       for(i=0;i<gvar.video.num_of_pages-2;i++)
+       for(i=0;i<gvar.video.num_of_pages;i++)
        {
                mv[i].page = &gvar.video.page[i];
                mv[i].map = &map;
@@ -172,7 +172,7 @@ void main(int argc, char *argv[])
        /* set up paging */
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen
        mapGoTo(mv, 0, 0);
-       //modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
+       modexCopyPageRegion(mv[1].page, mv[0].page, 0, 0, 0, 0, mv[1].page->width, mv[1].page->height);
 
        //TODO: put player in starting position of spot
        //default player position on the viewable map
@@ -318,16 +318,15 @@ void main(int argc, char *argv[])
        for(i=0; i<gvar.video.num_of_pages;i++)
        {
                printf("        [%u]=", i);
-               printf("(%Fp)\n", (gvar.video.page[i].data));
+               printf("(%Fp)", (gvar.video.page[i].data));
+               printf(" size=%ld", gvar.video.page[i].pagesize);
+               printf(" sw=%lu  sh=%lu ", (unsigned long)gvar.video.page[i].sw, (unsigned long)gvar.video.page[i].sh);
+               printf(" width=%lu  height=%lu", (unsigned long)gvar.video.page[i].width, (unsigned long)gvar.video.page[i].height);
+               printf("\n");
        }
        printf("mv[%u].tx: %d", pan.pn, mv[pan.pn].tx); printf("        mv[%u].ty: %d   ", pan.pn, mv[pan.pn].ty); printf("panswitch=%u\n", panswitch);
        //printf("player[1].q: %d", player[1].q);       printf("        player[1].d: %d\n", player[1].d);
        printf("\n");
-//     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", mv[0].map->width, mv[0].map->height, mv[0].map->data[0]);
 
        printf("\n");

diff --git a/src/test.c b/src/test.c
index 9f5762de1db8915c1d6f0423bae6f5d7507b7f82..a57eb37cf9748facf15f9f9e588ae173c332971f 100755 (executable)
--- a/src/test.c
+++ b/src/test.c
@@ -91,10 +91,8 @@ void main(int argc, char *argv[])
                mv[i].tx        = 0;\r
                mv[i].ty        = 0;\r
        }\r
-       gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
-       gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
-//     gvar.video.page[0].width += 32;\r
-//     gvar.video.page[0].height += 32;\r
+//     gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);\r
+//     gvar.video.page[1] = modexNextPage(&gvar.video.page[0]);\r
 \r
 \r
        /* fill the page with one color, but with a black border */\r