From 3f67bb15d9ad88cca55ea3b53cd04fb85ee1233e Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 31 Oct 2007 12:30:28 +0000
Subject: [PATCH] small fix.

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@91 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/MachineSettings/ARM9/src/misc.c |  1 -
 build/systemMenu_RED/PictoChat/ARM9/src/PictoChat.c  | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/misc.c b/build/systemMenu_RED/MachineSettings/ARM9/src/misc.c
index 67d6de82..03f8c502 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/misc.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/misc.c
@@ -78,7 +78,6 @@ static BOOL WaitDetachTP( void );
 static void StartDetachTP( void );
 static void InitScreen( void );
 static void InitCanvas( void );
-static void GetAndDrawRtcDataCore( BOOL forceGetFlag );
 
 // global variable-------------------------------------------------------------
 KeyWork		pad;													// キーパッド入力データ
diff --git a/build/systemMenu_RED/PictoChat/ARM9/src/PictoChat.c b/build/systemMenu_RED/PictoChat/ARM9/src/PictoChat.c
index 72ff6e53..e2c466e1 100644
--- a/build/systemMenu_RED/PictoChat/ARM9/src/PictoChat.c
+++ b/build/systemMenu_RED/PictoChat/ARM9/src/PictoChat.c
@@ -31,6 +31,9 @@
 // function's prototype declaration---------------------
 
 // global variable -------------------------------------
+RTCDrawProperty g_rtcDraw = {
+	TRUE, RTC_DATE_TOP_X, RTC_DATE_TOP_Y, RTC_TIME_TOP_X, RTC_TIME_TOP_Y
+};
 
 // static variable -------------------------------------
 
@@ -49,7 +52,7 @@ void PictoChatInit( void )
 	
 	PutStringUTF16( 1 * 8, 0 * 8, TXT_COLOR_BLUE,  (const u16 *)L"PictoChat");
 	PutStringUTF16( 4 * 8, 8 * 8, TXT_COLOR_BLACK, (const u16 *)L"Under Construction...");
-	InitGetAndDrawRtcData( 72, 80, 64 + 32, 80 + 16 );
+	GetAndDrawRTCData( &g_rtcDraw, TRUE );
 	
 	GXS_SetVisiblePlane( GX_PLANEMASK_BG0 );
 	GX_DispOn();
@@ -66,15 +69,15 @@ void PictoChatMain(void)
 	
 	// [RETURN]ボタン押下チェック
 	if(tpd.disp.touch) {
-		tp_cancel = InRangeTp( RETURN_BUTTON_TOP_X * 8,    RETURN_BUTTON_TOP_Y * 8 - 4,
-							   RETURN_BUTTON_BOTTOM_X * 8, RETURN_BUTTON_BOTTOM_Y * 8 - 4, &tpd.disp );
+		tp_cancel = WithinRangeTP(  RETURN_BUTTON_TOP_X * 8,    RETURN_BUTTON_TOP_Y * 8 - 4,
+									RETURN_BUTTON_BOTTOM_X * 8, RETURN_BUTTON_BOTTOM_Y * 8 - 4, &tpd.disp );
 	}
 	
 	if( ( pad.trg & PAD_BUTTON_B ) || tp_cancel ) {
 //		SYSM_RebootLauncher();
 	}
 	
-	GetAndDrawRtcData();
+	GetAndDrawRTCData( &g_rtcDraw, FALSE );
 }