#include "src/lib/16_timer.h"\r
#include "src/lib/16_dbg.h"\r
\r
-//#define FADE\r
+#define FADE\r
#define MODEX //this is for mode x initiating\r
\r
//bitmap_t p;\r
//map_view_db_t pgid[4];\r
word pg;\r
//#ifdef FADE\r
- //static word paloffset=0;\r
+ static word paloffset=0;\r
byte *dpal;\r
//#endif\r
byte *gpal;\r
\r
/* setup camera and screen~ */\r
modexHiganbanaPageSetup(&gvar.video);\r
- for(i=0;i<gvar.video.num_of_pages;i++)\r
- {\r
- mv[i].page = &gvar.video.page[i];\r
- mv[i].map = ↦\r
- mv[i].video = &gvar.video;\r
- mv[i].pan = &pan;\r
- }\r
+ modexMVSetup(&mv, &map, &pan, &gvar);\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
if(!panswitch){\r
walk(mv, &player, 0);\r
}else{\r
- panpagemanual(mv, &player, 0);\r
+ panPageManual(mv, &player, 0);\r
//printf(" player[0].q: %d", player[0].q); printf(" player[0].d: %d\n", player[0].d);\r
}\r
\r
#ifdef MODEX\r
#ifdef FADE\r
if(IN_KeyDown(24)){ modexPalUpdate0(gpal); paloffset=0; modexpdump(mv[0].page); modexpdump(mv[1].page); IN_UserInput(1,1); } //p\r
- if(IN_KeyDown(22)){\r
+ /*if(IN_KeyDown(22)){\r
paloffset=0; modexPalBlack(); modexPalUpdate(player[0].data, &paloffset, 0, 0);\r
printf("1paloffset = %d\n", paloffset/3);\r
modexPalUpdate(map.tiles->data, &paloffset, 0, 0);\r
printf("2paloffset = %d\n", paloffset/3);\r
modexpdump(mv[0].page); modexpdump(mv[1].page);\r
IN_UserInput(1,1);\r
- }\r
+ }*/\r
#endif\r
#endif\r
//pan switch\r
// modexDrawSprite(mv[0].page, 16, 16, &p);\r
modexDrawSprite(mv[0].page, 32+72, 16, (player[0].data));\r
}\r
- //TODO fmemtest into page\r
+ FUNCTIONKEYFUNCTIONS;\r
+ // fmemtest into page\r
/*if(IN_KeyDown(4+1)) //4\r
{\r
pg=1;\r
}*/\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