- Avoid PAL-M when using digital AV.

emukidid · Sep 7, 2020 · f585096 · f585096
1 parent d46fd2a
commit f585096
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/cube/swiss/source/main.c b/cube/swiss/source/main.c
@@ -62,7 +62,7 @@ void Initialise (void)
 		if(VIDEO_HaveComponentCable() && !(PAD_ButtonsDown(0) & PAD_TRIGGER_L)) {
 			if(strstr(IPLInfo,"MPAL")!=NULL) {
 				swissSettings.sramVideo = 2;
-				vmode = &TVMpal480Prog; //Progressive 480p
+				vmode = &TVNtsc480Prog; //Progressive 480p
 			}
 			else if((strstr(IPLInfo,"PAL")!=NULL)) {
 				swissSettings.sramVideo = 1;

diff --git a/cube/swiss/source/swiss.c b/cube/swiss/source/swiss.c
@@ -146,12 +146,8 @@ void ogc_video__reset()
 	uiDrawObj_t *msgBox = NULL;
 	switch(swissSettings.gameVMode) {
 		case -1:
-			if(swissSettings.sramVideo == 2) {
-				if(swissSettings.sramProgressive && !getDTVStatus())
-					msgBox = DrawMessageBox(D_WARN, "Video Mode: PAL-M 480i\nComponent Cable not detected.");
-				else
-					msgBox = DrawMessageBox(D_INFO, "Video Mode: PAL-M 480i");
-
+			if(swissSettings.sramVideo == 2 && !getDTVStatus()) {
+				msgBox = DrawMessageBox(D_INFO, "Video Mode: PAL-M 480i");
 				newmode = &TVMpal480IntDf;
 			} else {
 				if(swissSettings.sramProgressive && !getDTVStatus())

diff --git a/cube/swiss/source/video.c b/cube/swiss/source/video.c
@@ -56,18 +56,18 @@ int getDTVStatus() {
 GXRModeObj *getVideoModeFromSwissSetting(int uiVMode) {
 	switch(uiVMode) {
 		case 1:
-			switch(swissSettings.sramVideo) {
-				case 2:  return &TVMpal480IntDf;
-				case 1:  return &TVEurgb60Hz480IntDf;
-				default: return &TVNtsc480IntDf;
-			}
-		case 2:
 			if(getDTVStatus()) {
+				return &TVNtsc480IntDf;
+			} else {
 				switch(swissSettings.sramVideo) {
-					case 2:  return &TVMpal480Prog;
-					case 1:  return &TVEurgb60Hz480Prog;
-					default: return &TVNtsc480Prog;
+					case 2:  return &TVMpal480IntDf;
+					case 1:  return &TVEurgb60Hz480IntDf;
+					default: return &TVNtsc480IntDf;
 				}
+			}
+		case 2:
+			if(getDTVStatus()) {
+				return &TVNtsc480Prog;
 			} else {
 				switch(swissSettings.sramVideo) {
 					case 2:  return &TVMpal480IntDf;