makefile polished!! it seems everything works reletively ok

diff --git a/DEBUG.16W b/DEBUG.16W
new file mode 100755 (executable)
index 0000000..b916628
--- /dev/null
+++ b/DEBUG.16W
@@ -0,0 +1,210 @@
+\e[0mSeg:0      Size:9685       Owner:0x0\r
+\e[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\e[42;32m0000\r
+\e[0m\e[0mSeg:26ce       Size:44 Owner:0x0\r
+\e[41;31m+\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:26fa       Size:256        Owner:0x1660\r
+\e[44;34m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:27fa       Size:256        Owner:0x1452\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:28fa       Size:256        Owner:0x1454\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:29fa       Size:256        Owner:0x1456\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2afa       Size:256        Owner:0x1458\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2bfa       Size:256        Owner:0x145a\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2cfa       Size:256        Owner:0x145c\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2dfa       Size:256        Owner:0x145e\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2efa       Size:256        Owner:0x1460\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:2ffa       Size:256        Owner:0x1462\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:30fa       Size:256        Owner:0x1464\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:31fa       Size:256        Owner:0x1466\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:32fa       Size:256        Owner:0x1468\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:33fa       Size:256        Owner:0x146a\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:34fa       Size:256        Owner:0x146c\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:35fa       Size:256        Owner:0x146e\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:36fa       Size:256        Owner:0x1470\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:37fa       Size:256        Owner:0x1472\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:38fa       Size:256        Owner:0x1474\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:39fa       Size:256        Owner:0x1476\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3afa       Size:256        Owner:0x1478\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3bfa       Size:256        Owner:0x147a\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3cfa       Size:256        Owner:0x147c\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3dfa       Size:256        Owner:0x147e\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3efa       Size:256        Owner:0x1480\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:3ffa       Size:256        Owner:0x1482\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:40fa       Size:256        Owner:0x1484\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:41fa       Size:256        Owner:0x1486\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:42fa       Size:256        Owner:0x1488\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:43fa       Size:256        Owner:0x148a\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:44fa       Size:256        Owner:0x148c\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:45fa       Size:256        Owner:0x148e\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:46fa       Size:256        Owner:0x1490\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:47fa       Size:256        Owner:0x1492\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:48fa       Size:256        Owner:0x1494\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:49fa       Size:256        Owner:0x1496\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4afa       Size:256        Owner:0x1498\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4bfa       Size:256        Owner:0x149a\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4cfa       Size:256        Owner:0x149c\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4dfa       Size:256        Owner:0x149e\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4efa       Size:256        Owner:0x14a0\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:4ffa       Size:256        Owner:0x14a2\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:50fa       Size:256        Owner:0x14a4\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:51fa       Size:256        Owner:0x14a6\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:52fa       Size:256        Owner:0x14a8\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:53fa       Size:256        Owner:0x14aa\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:54fa       Size:256        Owner:0x14ac\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:55fa       Size:256        Owner:0x14ae\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:56fa       Size:256        Owner:0x14b0\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:57fa       Size:256        Owner:0x14b2\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:58fa       Size:256        Owner:0x14b4\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:59fa       Size:256        Owner:0x14b6\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5afa       Size:256        Owner:0x14b8\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5bfa       Size:256        Owner:0x14ba\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5cfa       Size:256        Owner:0x14bc\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5dfa       Size:256        Owner:0x14be\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5efa       Size:256        Owner:0x14c0\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:5ffa       Size:256        Owner:0x14c2\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:60fa       Size:256        Owner:0x14c4\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:61fa       Size:256        Owner:0x14c6\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:62fa       Size:256        Owner:0x14c8\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:63fa       Size:256        Owner:0x14ca\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:64fa       Size:256        Owner:0x14cc\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:65fa       Size:256        Owner:0x14ce\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:66fa       Size:256        Owner:0x14d0\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:67fa       Size:256        Owner:0x14d2\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:68fa       Size:256        Owner:0x14d4\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:69fa       Size:256        Owner:0x14d6\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6afa       Size:256        Owner:0x14d8\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6bfa       Size:256        Owner:0x14da\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6cfa       Size:256        Owner:0x14dc\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6dfa       Size:256        Owner:0x14de\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6efa       Size:256        Owner:0x14e0\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:6ffa       Size:256        Owner:0x14e2\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:70fa       Size:256        Owner:0x14e4\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:71fa       Size:256        Owner:0x14e6\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:72fa       Size:256        Owner:0x14e8\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:73fa       Size:256        Owner:0x14ea\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:74fa       Size:256        Owner:0x14ec\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:75fa       Size:256        Owner:0x14ee\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:76fa       Size:256        Owner:0x14f0\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:77fa       Size:256        Owner:0x14f2\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:78fa       Size:256        Owner:0x14f4\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:79fa       Size:256        Owner:0x14f6\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7afa       Size:256        Owner:0x14f8\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7bfa       Size:256        Owner:0x14fa\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7cfa       Size:256        Owner:0x14fc\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7dfa       Size:256        Owner:0x14fe\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7efa       Size:256        Owner:0x1500\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:7ffa       Size:256        Owner:0x1502\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:80fa       Size:256        Owner:0x1504\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:81fa       Size:256        Owner:0x1506\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:82fa       Size:256        Owner:0x1508\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:83fa       Size:256        Owner:0x150a\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:84fa       Size:256        Owner:0x150c\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:85fa       Size:256        Owner:0x150e\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:86fa       Size:256        Owner:0x1510\r
+\e[45;35m+++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:87fa       Size:256        Owner:0x1512\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:88fa       Size:256        Owner:0x1514\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:89fa       Size:256        Owner:0x1516\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:8afa       Size:256        Owner:0x1518\r
+\e[45;35m++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:8bfa       Size:401        Owner:0xec1c\r
+\e[44;34m++++++\e[0m\e[42;32m\r
+\e[0m\e[0mSeg:b6fa       Size:18693      Owner:0x0\r
+\e[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m
\ No newline at end of file

diff --git a/HEAP.16W b/HEAP.16W
new file mode 100755 (executable)
index 0000000..37db2a7
--- /dev/null
+++ b/HEAP.16W
@@ -0,0 +1,69 @@
+\r
+       == default ==\r
+\r
+  USED block at 26f00016 of size 136\r
+  FREE block at 26f0009e of size 68\r
+  USED block at 26f000e2 of size 50\r
+  USED block at 26f00114 of size 50\r
+  USED block at 26f00146 of size 50\r
+  USED block at 26f00178 of size 50\r
+  USED block at 26f001aa of size 50\r
+  USED block at 26f001dc of size 50\r
+  USED block at 26f0020e of size 50\r
+  USED block at 26f00240 of size 50\r
+  USED block at 26f00272 of size 50\r
+  USED block at 26f002a4 of size 50\r
+  USED block at 26f002d6 of size 50\r
+  USED block at 26f00308 of size 50\r
+  FREE block at 26f0033a of size 14\r
+  USED block at 26f00348 of size 20\r
+  FREE block at 26f0035c of size 7328\r
+OK - end of heap\r
+\r
+       == near ==\r
+\r
+  USED block at 16efec66 of size 12\r
+  USED block at 16efec72 of size 330\r
+  USED block at 16efedbc of size 52\r
+  USED block at 16efedf0 of size 20\r
+  USED block at 16efee04 of size 20\r
+  USED block at 16efee18 of size 20\r
+  USED block at 16efee2c of size 20\r
+  USED block at 16efee40 of size 20\r
+  USED block at 16efee54 of size 4520\r
+OK - end of heap\r
+\r
+       == far ==\r
+\r
+  USED block at 26f00016 of size 136\r
+  USED block at 26f0009e of size 68\r
+  USED block at 26f000e2 of size 50\r
+  USED block at 26f00114 of size 50\r
+  USED block at 26f00146 of size 50\r
+  USED block at 26f00178 of size 50\r
+  USED block at 26f001aa of size 50\r
+  USED block at 26f001dc of size 50\r
+  USED block at 26f0020e of size 50\r
+  USED block at 26f00240 of size 50\r
+  USED block at 26f00272 of size 50\r
+  USED block at 26f002a4 of size 50\r
+  USED block at 26f002d6 of size 50\r
+  USED block at 26f00308 of size 50\r
+  USED block at 26f0033a of size 14\r
+  USED block at 26f00348 of size 20\r
+  USED block at 26f0035c of size 7328\r
+OK - end of heap\r
+\r
+Memory Type         Total      Used       Free\r
+----------------  --------   --------   --------\r
+Default                   8166         756       7410\r
+Near              5014         494       4520\r
+Far               8166         756       7410\r
+----------------  --------   --------   --------\r
+coreleft = 4518\r
+farcoreleft = 36334\r
+GetFreeSize = 31836\r
+GetNearFreeSize = 4520\r
+GetFarFreeSize = 31836\r
+memavl = 4518\r
+stackavail = 31539\r

diff --git a/MMDUMP.16W b/MMDUMP.16W
new file mode 100755 (executable)
index 0000000..fba9a1a
Binary files /dev/null and b/MMDUMP.16W differ

diff --git a/src/0.c b/src/0.c
index c0f215374d7aad49b59ca6b664db3df9b0e18c50..f34cda637d9edcf8746550f09633e300fe36f524 100755 (executable)
--- a/src/0.c
+++ b/src/0.c
@@ -146,7 +146,7 @@ int main(int argc,char **argv) {
                        h = vrl_header->height + overdraw + y - ry;\r
                        w = (x + vrl_header->width + (overdraw*2) + 3/*round up*/ - rx) & (~3);\r
                        if ((rx+w) > gvar.video.page[0].width) w = gvar.video.page[0].width-rx;\r
-                       if ((ry+h) > gvar.video.page[0].height) h = (gvar.video.page[0].height)-ry;\r
+                       if ((ry+h) > gvar.video.page[0].height) h = gvar.video.page[0].height-ry;\r
 \r
                        /* block copy pattern to where we will draw the sprite */\r
                        vga_setup_wm1_block_copy();\r

diff --git a/src/lib/16_sprit.c b/src/lib/16_sprit.c
index 3bfd3f1c7619b98f1977abe48ace52375c9c893a..c11ff63895d18dc3d741f1a59a7076aa0c4f17c0 100755 (executable)
--- a/src/lib/16_sprit.c
+++ b/src/lib/16_sprit.c
@@ -98,7 +98,7 @@ void print_anim_ids(struct sprite *spri)
 }\r
 \r
 \r
-void animate_spri(struct sprite *spri, global_game_variables_t *gvar)\r
+void animate_spri(struct sprite *spri, global_game_variables_t *gv)\r
 {\r
        int i;\r
        // Events go here\r
@@ -107,9 +107,10 @@ void animate_spri(struct sprite *spri, global_game_variables_t *gvar)
        i = get_vrl_by_id(spri->spritesheet, spri->curr_spri_id, spri->sprite_vrl_cont);\r
        if(i < 0)\r
        {\r
-               Quit (gvar, "Error retriving required sprite");\r
+               Quit (gv, "Error retriving required sprite");\r
        }\r
-       draw_vrl1_vgax_modex(   spri->x, spri->y,\r
+       draw_vrl1_vgax_modex(   spri->x,// - spri->sprite_vrl_cont->vrl_header->width-28,\r
+                                       spri->y,// - spri->sprite_vrl_cont->vrl_header->height*2 -(gv->video.page[0].sh/2),\r
                                spri->sprite_vrl_cont->vrl_header, spri->sprite_vrl_cont->line_offsets,\r
                                spri->sprite_vrl_cont->buffer + sizeof(struct vrl1_vgax_header),\r
                                spri->sprite_vrl_cont->data_size);\r

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index 53e45abd3aeea4eccc87938d4d6a8a0b4ad0bd6d..15f8931e3b017224def11378640bbab50026dfd8 100755 (executable)
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -295,17 +295,18 @@ void modexHiganbanaPageSetup(video_t *video)
 \r
        //setup the buffersize\r
        video->page[0].dy=video->page[0].dx=\r
-               video->page[1].dx=video->page[1].dy=16;\r
+               video->page[1].dx=video->page[1].dy=TILEWH;     // 1 tile size buffer\r
        video->page[2].dx=video->page[2].dy=\r
-               video->page[3].dx=video->page[3].dy=0;\r
+               video->page[3].dx=video->page[3].dy=0;          // cache pages are buffer wwww\r
 }\r
 \r
+//\r
+// move page to appropriate part and show it\r
+//\r
 void\r
 modexShowPage(page_t *page) {\r
-       word high_address;\r
-       word low_address;\r
-       word offset;\r
-       byte crtcOffset;\r
+       word high_address, low_address, offset;\r
+//     byte crtcOffset;\r
 \r
        /* calculate offset */\r
        offset = (word) page->data;\r
@@ -313,20 +314,20 @@ modexShowPage(page_t *page) {
        offset += page->dx >> 2;\r
 \r
        /* calculate crtcOffset according to virtual width */\r
-       crtcOffset = page->width >> 3;\r
+//     crtcOffset = page->width >> 3;\r
 \r
        high_address = HIGH_ADDRESS | (offset & 0xff00);\r
        low_address  = LOW_ADDRESS  | (offset << 8);\r
 \r
        /* wait for appropriate timing and then program CRTC */\r
-       //while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));\r
+//+=+=                                                                         while ((inp(INPUT_STATUS_1) & DISPLAY_ENABLE));\r
        outpw(CRTC_INDEX, high_address);\r
        outpw(CRTC_INDEX, low_address);\r
-       outp(CRTC_INDEX, 0x13);\r
-       outp(CRTC_DATA, crtcOffset);\r
+//     outp(CRTC_INDEX, 0x13);\r
+//     outp(CRTC_DATA, crtcOffset);\r
 \r
-       /*  wait for one retrace */\r
-       //while (!(inp(INPUT_STATUS_1) & VRETRACE));\r
+       /* wait for one retrace */\r
+//+=+=                                                                         while (!(inp(INPUT_STATUS_1) & VRETRACE));\r
 \r
        /* do PEL panning here */\r
        outp(AC_INDEX, 0x33);\r

diff --git a/src/scroll.c b/src/scroll.c
index d3faba1ae31c99200d877d854ef8f9d8466b1c16..22dde47a8a07720455fd08777e66161a3feda1a3 100755 (executable)
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -266,8 +266,11 @@ void main(int argc, char *argv[])
        }*/\r
 \r
        //9\r
-       if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-       //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
+#ifdef FADE\r
+               if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
+#endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
        if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
        }\r
 \r

diff --git a/src/zcroll.c b/src/zcroll.c
index 024e5ff09c71e9556393064ddd7f51d60eaf445f..e1b3c55799e3582fec76ef784b3dbf6d2189c6cb 100755 (executable)
--- a/src/zcroll.c
+++ b/src/zcroll.c
@@ -70,11 +70,11 @@ void main(int argc, char *argv[])
        player[0].ent->spri->spritesheet = malloc(sizeof(struct vrs_container));\r
 \r
        // create the map\r
-       fprintf(stderr, "testing map load~      ");\r
+//     fprintf(stderr, "testing map load~      ");\r
        loadmap("data/test.map", &map);\r
        chkmap(&map, 0);\r
-       printf("chkmap ok       ");\r
-       fprintf(stderr, "yay map loaded~~\n");\r
+//     printf("chkmap ok       ");\r
+//     fprintf(stderr, "yay map loaded~~\n");\r
 \r
        // data\r
        read_vrs(&gvar, "data/spri/chikyuu.vrs", player[0].ent->spri->spritesheet);\r
@@ -114,7 +114,7 @@ void main(int argc, char *argv[])
                mv[i].video = &gvar.video;\r
                mv[i].pan       = &pan;\r
        }\r
-       player[0].ent->spri->x = player[0].ent->spri->y = 20;\r
+       player[0].ent->spri->x = player[0].ent->spri->y = TILEWH;\r
 \r
        // set up paging\r
        //TODO: LOAD map data and position the map in the middle of the screen if smaller then screen\r
@@ -139,7 +139,7 @@ void main(int argc, char *argv[])
                modexFadeOn(4, dpal);\r
 #endif\r
        }\r
-       //animate_spri((player[0].ent->spri), &gvar);\r
+       animate_spri((player[0].ent->spri), &gvar);\r
 \r
        modexShowPage(mv[0].page);//!(gvar.video.p)\r
        shinku_fps_indicator_page = 0; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
@@ -225,8 +225,9 @@ void main(int argc, char *argv[])
                //9\r
 #ifdef FADE\r
                if(IN_KeyDown(10)){ modexPalOverscan(rand()%56); modexPalUpdate1(dpal); IN_UserInput(1,1); }\r
-               //if(IN_KeyDown(11)){ modexPalOverscan(15); }\r
 #endif\r
+               if(IN_KeyDown(sc_R)){ modexPalOverscan(rand()%56); } //r\r
+\r
                if((player[0].q==1) && !(player[0].x%TILEWH==0 && player[0].y%TILEWH==0)) break;        //incase things go out of sync!\r
                player[0].hp = 0;\r
        }\r