From c088fd969bf442c7eb25fec48984066aa5a6940f Mon Sep 17 00:00:00 2001
From: "fix94.1" <fix94.1@gmail.com>
Date: Fri, 15 Jun 2012 14:27:18 +0000
Subject: [PATCH] -lets use the video patching of r239 again, hopefully it
 works yet again

---
 source/loader/disc.c       | 116 ++++++++++++++++++++++++-------------
 source/loader/videopatch.c |   2 +-
 source/loader/videopatch.h |   1 +
 3 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/source/loader/disc.c b/source/loader/disc.c
index 1cc86cc3..7f9f92a6 100644
--- a/source/loader/disc.c
+++ b/source/loader/disc.c
@@ -38,7 +38,6 @@ static u8  *diskid = (u8  *)0x80000000;
 
 GXRModeObj *vmode = NULL;
 u32 vmode_reg = 0;
-u8 vidmode_selected = 0;
 
 extern void __exception_closeall();
 
@@ -66,56 +65,93 @@ void __Disc_SetLowMem()
 	memcpy((void *)Online_Check, (void *)Disc_ID, 4);
 }
 
-GXRModeObj *__Disc_SelectVMode(u8 videoselected, u64 chantitle)
+GXRModeObj * __Disc_SelectVMode(u8 videoselected, u64 chantitle)
 {
-	vmode = VIDEO_GetPreferredMode(NULL);
+	vmode = VIDEO_GetPreferredMode(0);
 
 	/* Get video mode configuration */
 	bool progressive = (CONF_GetProgressiveScan() > 0) && VIDEO_HaveComponentCable();
 
-	char Region;
-	if(chantitle != 0)
-		Region = ((u32)(chantitle) & 0xFFFFFFFF) % 256;
-	else
-		Region = diskid[3];
-
-	/* Select video mode */
-	switch(Region)
+	/* Select video mode register */
+	switch (CONF_GetVideo())
 	{
-		case 'W':
-			break; // Don't overwrite wiiware video modes.
-		// PAL
-		case 'D':
-		case 'F':
-		case 'P':
-		case 'X':
-		case 'Y':
-			vmode_reg = VI_PAL;
-			if(CONF_GetVideo() != CONF_VIDEO_PAL)
-				vmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
+		case CONF_VIDEO_PAL:
+			if (CONF_GetEuRGB60() > 0)
+			{
+				vmode_reg = VI_EURGB60;
+				vmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf;
+			}
+			else
+				vmode_reg = VI_PAL;
 			break;
-		// NTSC
-		case 'E':
-		case 'J':
+
+		case CONF_VIDEO_MPAL:
+			vmode_reg = VI_MPAL;
+			break;
+
+		case CONF_VIDEO_NTSC:
 			vmode_reg = VI_NTSC;
-			if(CONF_GetVideo() != CONF_VIDEO_NTSC)
-				vmode = progressive ? &TVNtsc480Prog : &TVPal528IntDf;
-			break;
-		default:
 			break;
 	}
 
-	if(videoselected)
+	char Region;
+	if(chantitle != 0)
+		Region = ((u32)(chantitle) & 0xFFFFFFFF) % 256;
+	else Region = diskid[3];
+
+	switch (videoselected)
 	{
-		if(videoselected == 1) //PAL50
-			vmode = &TVPal528IntDf;
-		else if(videoselected == 2) //PAL60
-			vmode = &TVEurgb60Hz480IntDf;
-		else if(videoselected == 3) //NTSC
-			vmode = &TVNtsc480IntDf;
-		else
+		case 0: // DEFAULT (DISC/GAME)
+			/* Select video mode */
+			switch (Region)
+			{
+				case 'W':
+					break; // Don't overwrite wiiware video modes.
+				// PAL
+				case 'D':
+				case 'F':
+				case 'P':
+				case 'X':
+				case 'Y':
+					if (CONF_GetVideo() != CONF_VIDEO_PAL)
+					{
+						vmode_reg = VI_PAL;
+						vmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
+					}
+					break;
+				// NTSC
+				case 'E':
+				case 'J':
+				default:
+					if (CONF_GetVideo() != CONF_VIDEO_NTSC)
+					{
+						vmode_reg = VI_NTSC;
+						vmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf;
+					}
+					break;
+			}
+			break;
+		case 1: // PAL50
+			vmode =  &TVPal528IntDf;
+			vmode_reg = vmode->viTVMode >> 2;
+			break;
+		case 2: // PAL60
+			vmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf;
+			vmode_reg = progressive ? TVEurgb60Hz480Prog.viTVMode >> 2 : vmode->viTVMode >> 2;
+			break;
+		case 3: // NTSC
+			vmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
+			vmode_reg = vmode->viTVMode >> 2;
+			break;
+		case 4: // AUTO PATCH TO SYSTEM
+		case 5: // SYSTEM
+			break;
+		case 6: // PROGRESSIVE 480P(NTSC + PATCH ALL)
 			vmode = &TVNtsc480Prog;
-		vmode_reg = vmode->viTVMode >> 2;
+			vmode_reg = vmode->viTVMode >> 2;
+			break;
+		default:
+			break;
 	}
 
 	return vmode;
@@ -131,12 +167,14 @@ void __Disc_SetVMode(void)
 	if(vmode != 0)
 		VIDEO_Configure(vmode);
 
-	/* Setup video  */
+	/* Setup video */
 	VIDEO_SetBlack(TRUE);
 	VIDEO_Flush();
 	VIDEO_WaitVSync();
 	if(vmode->viTVMode & VI_NON_INTERLACE)
 		VIDEO_WaitVSync();
+	else while(VIDEO_GetNextField())
+		VIDEO_WaitVSync();
 }
 
 void __Disc_SetTime(void)
diff --git a/source/loader/videopatch.c b/source/loader/videopatch.c
index 851554c5..e2a24781 100644
--- a/source/loader/videopatch.c
+++ b/source/loader/videopatch.c
@@ -245,7 +245,7 @@ static GXRModeObj* NTSC2PAL60[]={
 	&TVNtsc240IntAa,		&TVEurgb60Hz240IntAa,
 	&TVNtsc480IntDf,		&TVEurgb60Hz480IntDf,
 	&TVNtsc480IntAa,		&TVEurgb60Hz480IntAa,
-	&TVNtsc480Prog,			&TVNtsc480Prog,
+	&TVNtsc480Prog,			&TVEurgb60Hz480Prog,
 	0,0
 };
 
diff --git a/source/loader/videopatch.h b/source/loader/videopatch.h
index bbf7a547..bc9e53b4 100644
--- a/source/loader/videopatch.h
+++ b/source/loader/videopatch.h
@@ -5,4 +5,5 @@
 
 void patchVideoModes(void *dst, u32 len, int vidMode, GXRModeObj *vmode, int patchVidModes); 
 
+
 #endif // !defined(_VIDEOPATCH_H_)