p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[proj16/16.git] / src / xcroll.c

diff --git a/src/xcroll.c b/src/xcroll.c
index 7b97a9a..891f15c 100755 (executable)
--- a/src/xcroll.c
+++ b/src/xcroll.c
@@ -125,13 +125,24 @@ void main(int argc, char *argv[])
 #ifdef FADE\r
        modexPalSave(&gvar.video.palette);\r
        modexSavePalFile("data/g.pal", &gvar.video.palette);\r
-       modexPalBlack();        //so gvar.player will not see loadings~\r
+       modexPalBlack();        //so player will not see loadings~\r
 #endif\r
 \r
        // setup camera and screen~\r
        modexHiganbanaPageSetup(&gvar.video);\r
        ZC_MVSetup(&gvar.mv, &map, &gvar);\r
 \r
+#ifdef FADE\r
+       modexFadeOn(4, &gvar.video.palette);\r
+#endif\r
+\r
+       IN_StartAck (&gvar);\r
+       MM_ShowMemory(&gvar);\r
+       while (!IN_CheckAck (&gvar)){}\r
+#ifdef FADE\r
+       modexPalBlack();        //so player will not see loadings~\r
+#endif\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
        mapGoTo(&gvar.mv, 0, 0);\r
@@ -153,6 +164,7 @@ void main(int argc, char *argv[])
 //     while(!gvar.in.inst->Keyboard[sc_Escape) && !gvar.in.inst->Keyboard[sc_Space) && !gvar.in.inst->Keyboard[sc_Enter]){ FUNCTIONKEYSHOWMV }\r
        gvar.video.page[0].tlx=gvar.mv[0].tx*TILEWH;\r
        gvar.video.page[0].tly=gvar.mv[0].ty*TILEWH;\r
+\r
        shinku(&gvar);\r
 //modexpdump(gvar.mv[0].page);\r
 #ifdef FADE\r