Add SYS_SetFontEncoding

Use original TV format

Author: Extrems

gc/ogc/system.h

@@ -147,6 +147,9 @@ distribution.
 #define SYS_VIDEO_PAL					1
 #define SYS_VIDEO_MPAL					2
 
+#define SYS_FONTENC_ANSI				0
+#define SYS_FONTENC_SJIS				1
+
 #define SYS_FONTSIZE_ANSI				(288 + 131072)
 #define SYS_FONTSIZE_SJIS				(3840 + 1179648)
 
@@ -384,7 +387,8 @@ u16 SYS_GetGBSMode(void);
 void SYS_SetGBSMode(u16 mode);
 
 u32 SYS_GetConsoleType(void);
-u32 SYS_GetFontEncoding(void);
+u16 SYS_GetFontEncoding(void);
+u16 SYS_SetFontEncoding(u16 enc);
 u32 SYS_InitFont(sys_fontheader *font_data);
 void SYS_GetFontTexture(s32 c,void **image,s32 *xpos,s32 *ypos,s32 *width);
 void SYS_GetFontTexel(s32 c,void *image,s32 pos,s32 stride,s32 *width);

libogc/card.c

@@ -1650,7 +1650,7 @@ static s32 __card_read(s32 chn,u32 address,u32 block_len,void *buffer,cardcallba
 	return ret;
 }
 
-static s32 __card_formatregion(s32 chn,u32 encode,cardcallback callback)
+static s32 __card_formatregion(s32 chn,u16 encode,cardcallback callback)
 {
 	s32 ret;
 	u16 tmp;
@@ -2991,7 +2991,7 @@ s32 CARD_DeleteEntry(s32 chn,card_dir *dir_entry)
 
 s32 CARD_FormatAsync(s32 chn,cardcallback callback)
 {
-	u32 enc;
+	u16 enc;
 
 	enc = SYS_GetFontEncoding();
 	return __card_formatregion(chn,enc,callback);
@@ -3000,7 +3000,7 @@ s32 CARD_FormatAsync(s32 chn,cardcallback callback)
 s32 CARD_Format(s32 chn)
 {
 	s32 ret;
-	u32 enc;
+	u16 enc;
 
 	enc = SYS_GetFontEncoding();
 	if((ret=__card_formatregion(chn,enc,__card_synccallback))>=0) {

libogc/system.c

@@ -711,7 +711,7 @@ static u32 __unlocksram(u32 write,u32 loc)
 //returns the size of font
 static u32 __read_font(void *buffer)
 {
-	if(SYS_GetFontEncoding()==1) __SYS_ReadROM(buffer,315392,1769216);
+	if(SYS_GetFontEncoding()==SYS_FONTENC_SJIS) __SYS_ReadROM(buffer,315392,1769216);
 	else __SYS_ReadROM(buffer,12288,2084608);
 	return __get_fontsize(buffer);
 }
@@ -1556,26 +1556,36 @@ void* SYS_AllocateFramebuffer(GXRModeObj *rmode)
 	return memalign(32, VIDEO_GetFrameBufferSize(rmode));
 }
 
-u32 SYS_GetFontEncoding(void)
+u16 SYS_GetFontEncoding(void)
 {
-	u32 ret,tv_mode;
+	u16 ret;
+	u32 tv;
 
-	if(sys_fontenc<=0x0001) return sys_fontenc;
+	if(sys_fontenc!=0xffff) return sys_fontenc;
 
-	ret = 0;
-	tv_mode = VIDEO_GetCurrentTvMode();
-	if(tv_mode==VI_NTSC && _viReg[55]&0x0002) ret = 1;
+	ret = SYS_FONTENC_ANSI;
+	tv = *((u32*)0x800000cc);
+	if(tv==VI_NTSC && _viReg[55]&0x0002) ret = SYS_FONTENC_SJIS;
 	sys_fontenc = ret;
 	return ret;
 }
 
+u16 SYS_SetFontEncoding(u16 enc)
+{
+	u16 ret;
+
+	ret = SYS_GetFontEncoding();
+	if(enc<=SYS_FONTENC_SJIS) sys_fontenc = enc;
+	return ret;
+}
+
 u32 SYS_InitFont(sys_fontheader *font_data)
 {
 	void *packed_data = NULL;
 
 	if(!font_data) return 0;
 
-	if(SYS_GetFontEncoding()==1) {
+	if(SYS_GetFontEncoding()==SYS_FONTENC_SJIS) {
 		memset(font_data,0,SYS_FONTSIZE_SJIS);
 		packed_data = (void*)((u32)font_data+868096);
 	} else {