X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Ftesuto.h;h=bcd211bc17064cbd7ccda02e5e76807e0c0463df;hb=b070d62525540bfa0792d019e0b14fa08c96b987;hp=09aca18b07e77cc6d4e6f0fe1c4e506a1d24db78;hpb=6cfcd9ddd5f8b515913ea6f0e0f84f8e4c0fb720;p=16.git

diff --git a/src/tesuto.h b/src/tesuto.h
index 09aca18b..bcd211bc 100755
--- a/src/tesuto.h
+++ b/src/tesuto.h
@@ -10,15 +10,6 @@
 #include <hw/vga/vga.h>
 #include <hw/vga/vrl.h>
 
-//panPageManual(mv, player, 0);
-#define PANKEY0EXE \
-			panVmemManual(mv, player, 0); \
-			if(IN_KeyDown(1+1)){ pan.pn=0; modexShowPage(&(gvar.video.page[pan.pn])); } \
-			if(IN_KeyDown(2+1)){ pan.pn=1; modexShowPage(&(gvar.video.page[pan.pn])); } \
-			if(IN_KeyDown(3+1)){ pan.pn=2; modexShowPage(&(gvar.video.page[pan.pn])); } \
-			if(IN_KeyDown(4+1)){ pan.pn=3; modexShowPage(&(gvar.video.page[pan.pn])); } \
-			if(IN_KeyDown(25)){ modexpdump(mv[1].page); modexShowPage(&(gvar.video.page[1])); IN_UserInput(1,1); }
-
 ////corner markers
 #define GVPO gvar.video.page[0]
 #define GVPI gvar.video.page[1]
@@ -35,27 +26,27 @@
 
 #define DRAWOTHERCORNERBOX_TOPLEFT \
 DCBO,	0,	0,	16, 16, 0); \
-DCBO,	16,	16,	16, 16, 2); \
-DCBI,		0,	0,	16, 16, 0); \
-DCBI,		16,	16,	16, 16, 2);
+DCBO,	16,	16,	16, 16, 1); \
+DCBI,		0,	0,	16, 16, 8); \
+DCBI,		16,	16,	16, 16, 9);
 
 #define DRAWOTHERCORNERBOX_TOPRIGHT \
-DCBO,	OW,	0,	16, 16, 0); \
-DCBO,	OE,	16,	16, 16, 2); \
-DCBI,		IW,	0,	16, 16, 0); \
-DCBI,		IE,	16,	16, 16, 2);
+DCBO,	OW,	0,	16, 16, 2); \
+DCBO,	OE,	16,	16, 16, 3); \
+DCBI,		IW,	0,	16, 16, 10); \
+DCBI,		IE,	16,	16, 16, 11);
 
 #define DRAWOTHERCORNERBOX_BOTTOMLEFT \
-DCBO,	0,	OH,	16, 16, 0); \
-DCBO,	16,	OJ,	16, 16, 2); \
-DCBI,		0,	IH,	16, 16, 0); \
-DCBI,		16,	IJ,	16, 16, 2);
+DCBO,	0,	OH,	16, 16, 4); \
+DCBO,	16,	OJ,	16, 16, 5); \
+DCBI,		0,	IH,	16, 16, 12); \
+DCBI,		16,	IJ,	16, 16, 13);
 
 #define DRAWOTHERCORNERBOX_BOTTOMRIGHT \
-DCBO,	OE,	OJ,	16, 16, 2); \
-DCBO,	OW,	OH,	16, 16, 0); \
-DCBI,		IE,	IJ,	16, 16, 2);\
-DCBI,		IW,	IH,	16, 16, 0);
+DCBO,	OE,	OJ,	16, 16, 6); \
+DCBO,	OW,	OH,	16, 16, 7); \
+DCBI,		IE,	IJ,	16, 16, 14);\
+DCBI,		IW,	IH,	16, 16, 15);
 
 #define DRAWCORNERBOXES \
 DRAWOTHERCORNERBOX_TOPLEFT; \
@@ -64,6 +55,14 @@ DRAWOTHERCORNERBOX_BOTTOMLEFT; \
 DRAWOTHERCORNERBOX_BOTTOMRIGHT; \
 
 #define TESTBG \
+	modexClearRegion(&gvar.video.page[1], 0, 0, gvar.video.page[1].width, gvar.video.page[1].height, 15); \
+	modexClearRegion(&gvar.video.page[1], 16, 16, gvar.video.page[1].sw, gvar.video.page[1].sh, 128); \
+	modexClearRegion(&gvar.video.page[1], 32, 32, gvar.video.page[1].sw-32, gvar.video.page[1].sh-32, 42); \
+	modexClearRegion(&gvar.video.page[1], 48, 48, gvar.video.page[1].sw-64, gvar.video.page[1].sh-64, 128); \
+	modexClearRegion(&gvar.video.page[2], 0, 0, gvar.video.page[2].sw, gvar.video.page[2].sh, 47); \
+	modexClearRegion(&gvar.video.page[3], 0, 0, gvar.video.page[3].sw, gvar.video.page[3].sh, 45);
+
+#define TESTBGFULL \
 	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].width, gvar.video.page[0].height, 15); \
 	modexClearRegion(&gvar.video.page[0], 16, 16, gvar.video.page[0].sw, gvar.video.page[0].sh, 128); \
 	modexClearRegion(&gvar.video.page[0], 32, 32, gvar.video.page[0].sw-32, gvar.video.page[0].sh-32, 42); \