From f0d3c17a2cd825e9cc052534741186dadbdb9e7c Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 26 Nov 2007 05:22:15 +0000
Subject: [PATCH] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=8C=E9=87=8D=E3=81=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=8D=E3=81=9F=E3=81=AE=E3=81=A7?=
 =?UTF-8?q?=E3=80=81=E3=81=A1=E3=82=89=E3=81=A4=E3=81=8D=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AB=E5=89=B2=E3=82=8A=E7=AE=97?=
 =?UTF-8?q?=E3=82=92=E8=8B=A5=E5=B9=B2=E9=99=A4=E5=8E=BB=E3=81=A8RTC?=
 =?UTF-8?q?=E6=83=85=E5=A0=B1=E5=8F=96=E5=BE=97=E9=96=A2=E6=95=B0=E5=91=BC?=
 =?UTF-8?q?=E3=81=B3=E5=87=BA=E3=81=97=E4=BD=8D=E7=BD=AE=E3=81=AE=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@252 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/launcher.c              | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index aeaffcb2..8e8e44df 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -264,6 +264,8 @@ static void SetAffineAnimation( int cursor )
 static void BannerDraw(int cursor, int selected, TitleProperty *titleprop)
 {
 	int l;
+	int div1 = cursor / FRAME_PER_SELECT;
+	int div2 = cursor % FRAME_PER_SELECT;
 	
 	LoadBannerToVRAM( titleprop );
 
@@ -273,7 +275,7 @@ static void BannerDraw(int cursor, int selected, TitleProperty *titleprop)
 	// OAMデータを弄って位置など変更
 	for (l=0;l<MAX_SHOW_BANNER;l++)
 	{
-		int num = cursor/FRAME_PER_SELECT - 2 + l;
+		int num = div1 - 2 + l;
 		if(-1 < num && num < LAUNCHER_TITLE_LIST_NUM){
 			banner_oam_attr[l].charNo = image_index_list[num]*4;
 		    // パレットのロード
@@ -285,12 +287,12 @@ static void BannerDraw(int cursor, int selected, TitleProperty *titleprop)
 			{
 				G2_SetOBJEffect(&banner_oam_attr[l], GX_OAM_EFFECT_AFFINE_DOUBLE, l-2);
 				G2_SetOBJPosition(&banner_oam_attr[l],
-									BANNER_FAR_LEFT_POS - BANNER_WIDTH/2 + l*(BANNER_WIDTH + BANNER_INTERVAL) - (cursor%FRAME_PER_SELECT)*DOT_PER_FRAME,
+									BANNER_FAR_LEFT_POS - BANNER_WIDTH/2 + l*(BANNER_WIDTH + BANNER_INTERVAL) - div2 * DOT_PER_FRAME,
 									BANNER_TOP - BANNER_HEIGHT/2 );
 			}
 			else					// その他のバナー
 			{
-				banner_oam_attr[l].x = BANNER_FAR_LEFT_POS + l*(BANNER_WIDTH + BANNER_INTERVAL) - (cursor%FRAME_PER_SELECT)*DOT_PER_FRAME;
+				banner_oam_attr[l].x = BANNER_FAR_LEFT_POS + l*(BANNER_WIDTH + BANNER_INTERVAL) - div2 * DOT_PER_FRAME;
 				G2_SetOBJEffect(&banner_oam_attr[l],GX_OAM_EFFECT_NONE,0);
 			}
 		}else
@@ -360,9 +362,6 @@ BOOL LauncherFadeout( TitleProperty *pTitleList )
 {
 	static int fadecount = 0;
 	
-	// RTC情報の取得＆表示
-	GetAndDrawRTCData( &g_rtcDraw, FALSE );
-	
 	// 描画関係
     NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL );
 	PrintfSJIS( 0, 0, TXT_COLOR_BLUE, "TWL-SYSTEM MENU ver.%06x", SYSMENU_VER );
@@ -390,6 +389,9 @@ BOOL LauncherFadeout( TitleProperty *pTitleList )
 	DC_FlushRange(&banner_oam_attr, sizeof(banner_oam_attr));
 	GX_LoadOAM(&banner_oam_attr, 0, sizeof(banner_oam_attr));
 
+	// RTC情報の取得＆表示
+	GetAndDrawRTCData( &g_rtcDraw, FALSE );
+	
 	// フェードアウトのカウント処理
 	G2_ChangeBlendAlpha( fadecount/FADE_COUNT_PER_ALPHA, ALPHA_MAX-(fadecount/FADE_COUNT_PER_ALPHA) );
 	if(fadecount < FADE_COUNT_MAX) {
@@ -581,9 +583,6 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 {
 	TitleProperty *ret = NULL;
 	
-	// RTC情報の取得＆表示
-	GetAndDrawRTCData( &g_rtcDraw, FALSE );
-	
 	// キー及びタッチ制御
 	ret = ProcessPads( pTitleList );
 	MoveByScrollBar();
@@ -599,6 +598,9 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	BannerDraw( s_csr, selected, pTitleList );
 	#endif
 	
+	// RTC情報の取得＆表示
+	GetAndDrawRTCData( &g_rtcDraw, FALSE );
+	
 	return ret;
 }