- Ensure NTSC-J games are output in NTSC on PAL-M.

emukidid · Mar 5, 2025 · ea46934 · ea46934
1 parent f8bf81a
commit ea46934
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cube/swiss/source/config/config.c b/cube/swiss/source/config/config.c
@@ -1226,7 +1226,7 @@ void config_load_current(ConfigEntry *entry) {
 	swissSettings.disableDithering = entry->disableDithering;
 	swissSettings.forceAnisotropy = entry->forceAnisotropy;
 	swissSettings.forceWidescreen = entry->forceWidescreen;
-	swissSettings.fontEncode = entry->region == 'J';
+	swissSettings.fontEncode = entry->region == 'J' ? SYS_FONTENC_SJIS : SYS_FONTENC_ANSI;
 	swissSettings.forcePollRate = entry->forcePollRate;
 	swissSettings.invertCStick = entry->invertCStick;
 	swissSettings.swapCStick = entry->swapCStick;
@@ -1245,7 +1245,7 @@ void config_load_current(ConfigEntry *entry) {
 	if(entry->region == 'P')
 		swissSettings.sramVideo = SYS_VIDEO_PAL;
 	else if((swissSettings.sramVideo == SYS_VIDEO_PAL && !strchr("A?", entry->region)) ||
-			(swissSettings.sramVideo == SYS_VIDEO_MPAL && getDTVStatus()))
+			(swissSettings.sramVideo == SYS_VIDEO_MPAL && (swissSettings.fontEncode == SYS_FONTENC_SJIS || getDTVStatus())))
 		swissSettings.sramVideo = SYS_VIDEO_NTSC;
 
 	if(swissSettings.gameVMode > 0 && swissSettings.disableVideoPatches < 2) {

diff --git a/cube/swiss/source/video.c b/cube/swiss/source/video.c
@@ -108,7 +108,7 @@ int getDTVStatus() {
 
 int getFontEncode() {
 	volatile unsigned short* vireg = (volatile unsigned short*)0xCC002000;
-	return (vireg[55] >> 1) & 1;
+	return (vireg[55] >> 1) & 1 ? SYS_FONTENC_SJIS : SYS_FONTENC_ANSI;
 }
 
 f32 getYScaleFactor(u16 efbHeight, u16 xfbHeight) {