X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=common%2Fmenu.c;h=4393ed5172f617a954ce710fe78e1e95f89a4209;hb=35cbf2ec89d87204288d4d40ad46bf77361e5cfe;hp=adfacefb03a2417b22ee22ff68db164085ffc46d;hpb=9efc102f1c8f6e2ebc5412f1b2c45a0c77acad48;p=libpicofe.git

diff --git a/common/menu.c b/common/menu.c
index adfacef..4393ed5 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -1689,10 +1689,6 @@ static int menu_loop_options(menu_id id, int keys)
 
 	me_loop(e_menu_options, &sel, NULL);
 
-	if (PicoRegionOverride)
-		// force setting possibly changed..
-		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
-
 	return 0;
 }
 
@@ -1752,11 +1748,12 @@ static void draw_text_debug(const char *str, int skip, int from)
 
 static void draw_frame_debug(void)
 {
-	char layer_str[48] = "layers:             ";
+	char layer_str[48] = "layers:                   ";
 	if (PicoDrawMask & PDRAW_LAYERB_ON)      memcpy(layer_str +  8, "B", 1);
 	if (PicoDrawMask & PDRAW_LAYERA_ON)      memcpy(layer_str + 10, "A", 1);
 	if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
 	if (PicoDrawMask & PDRAW_SPRITES_HI_ON)  memcpy(layer_str + 19, "spr_hi", 6);
+	if (PicoDrawMask & PDRAW_32X_ON)         memcpy(layer_str + 26, "32x", 4);
 
 	memset(g_screen_ptr, 0, g_screen_width * g_screen_height * 2);
 	pemu_forced_frame(0);
@@ -1796,14 +1793,18 @@ static void debug_menu_loop(void)
 					g_screen_width, spr_offs);
 				draw_text_debug(PDebugSpriteList(), spr_offs, 6);
 				break;
+			case 4: plat_video_menu_begin();
+				tmp = PDebug32x();
+				draw_text_debug(tmp, 0, 0);
+				break;
 		}
 		plat_video_menu_end();
 
 		inp = in_menu_wait(PBTN_MOK|PBTN_MBACK|PBTN_MA2|PBTN_MA3|PBTN_L|PBTN_R |
 					PBTN_UP|PBTN_DOWN|PBTN_LEFT|PBTN_RIGHT, 70);
 		if (inp & PBTN_MBACK) return;
-		if (inp & PBTN_L) { mode--; if (mode < 0) mode = 3; }
-		if (inp & PBTN_R) { mode++; if (mode > 3) mode = 0; }
+		if (inp & PBTN_L) { mode--; if (mode < 0) mode = 4; }
+		if (inp & PBTN_R) { mode++; if (mode > 4) mode = 0; }
 		switch (mode)
 		{
 			case 0:
@@ -1826,6 +1827,7 @@ static void debug_menu_loop(void)
 				if (inp & PBTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
 				if (inp & PBTN_DOWN)  PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
 				if (inp & PBTN_UP)    PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
+				if (inp & PBTN_MA2)   PicoDrawMask ^= PDRAW_32X_ON;
 				if (inp & PBTN_MOK) {
 					PsndOut = NULL; // just in case
 					PicoSkipFrame = 1;