X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_vl.c;h=1f5754d9c2edcca74ddca917b6900ccf7df8e781;hb=0df3c2d5e81ce6a2f1d498b3107e1fd223e7af80;hp=ec88898e735970468bd45af832103957a6706f85;hpb=2fb58644b5c539decd246968bc9cc99b94069364;p=16.git

diff --git a/src/lib/16_vl.c b/src/lib/16_vl.c
index ec88898e..1f5754d9 100755
--- a/src/lib/16_vl.c
+++ b/src/lib/16_vl.c
@@ -545,6 +545,9 @@ void modexHiganbanaPageSetup(global_game_variables_t *gvar)
 		gvar->video.page[1].dx=gvar->video.page[1].dy=TILEWH;	// 1 tile size buffer
 	gvar->video.page[2].dx=gvar->video.page[2].dy=
 		gvar->video.page[3].dx=gvar->video.page[3].dy=0;		// cache pages are buffer wwww
+
+	gvar->video.page[0].tlx=gvar->mv[0].tx*TILEWH;
+	gvar->video.page[0].tly=gvar->mv[0].ty*TILEWH;
 }
 
 //
@@ -916,6 +919,8 @@ modexLoadPalFile(byte *filename, byte *palette) {
 	fclose(file);
 }
 
+#define COREPALSIZE 9//27	//3*9
+
 void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word palsize, global_game_variables_t *gvar)
 {
 	int fd;
@@ -923,36 +928,36 @@ void VLL_LoadPalFilewithoffset(const char *filename, byte *palette, word o, word
 
 	fd = open(filename,O_RDONLY|O_BINARY);
 	if (fd >= 0) {
-		read(fd,palette,	palsize);
+		read(fd,palette,	palsize*3);
 		close(fd);
 
-		if(palsize==27) newpalette = palette; else{	//if core then load it
+		if(palsize==COREPALSIZE) newpalette = palette; else{	//if core then load it
 		newpalette = &palette[3];			//skip overscan color
 		if(!o) o++;
 		}
-		VL_UpdatePaletteWrite(newpalette, o, gvar);
+		VL_UpdatePaletteWrite(newpalette, o, palsize, gvar);
 	}
 }
 
 void VL_LoadPalFile(const char *filename, byte *palette, global_game_variables_t *gvar)
 {
 	VLL_LoadPalFilewithoffset(filename, palette,
-		0,	//overwrite core/system palette
-//		9,	//preserved core/system palette
-		PAL_SIZE, gvar);
+		0,			//overwrite core/system palette
+//		COREPALSIZE,	//preserved core/system palette
+		PAL_SIZE/3, gvar);
 }
 
 void VL_LoadPalFileCore(byte *palette, global_game_variables_t *gvar)
 {
-	VLL_LoadPalFilewithoffset("data/16.pal", palette, 0, 27, gvar);
+	VLL_LoadPalFilewithoffset("data/16.pal", palette, 0, COREPALSIZE, gvar);
 }
 
-void VL_UpdatePaletteWrite(byte *palette, word o, global_game_variables_t *gvar)
+void VL_UpdatePaletteWrite(byte *palette, word o, word p, global_game_variables_t *gvar)
 {
 	word i;
 
 	vga_palette_lseek(o);
-	for (i=0;i < 255-o;i++)
+	for (i=0;i < p-o;i++)
 		vga_palette_write(palette[(i*3)+0]>>2,palette[(i*3)+1]>>2,palette[(i*3)+2]>>2);
 
 	VL_PaletteSync(gvar);