From 5f7b702fefe19195fc55b568399a74379f9e3c82 Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Mon, 19 Nov 2007 07:18:42 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=83=83=E3=83=81=E3=83=91=E3=83=83=E3=83=89=E4=B8=80?=
 =?UTF-8?q?=E9=83=A8=E5=AF=BE=E5=BF=9C=20=E5=8F=8A=E3=81=B3=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=82=BF=E5=AE=A3=E8=A8=80=E3=83=9F=E3=82=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E2=80=A6=E2=80=A6?=
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@213 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../Launcher/ARM9/src/launcher.c              | 45 +++++++++++--------
 .../MachineSettings/ARM9/src/MachineSetting.c |  2 +-
 .../MachineSettings/ARM9/src/setOwnerInfo.c   |  4 +-
 build/systemMenu_RED/data/BGData_Launcher.c   |  4 +-
 .../data/BGData_MachineSettings.c             |  2 +-
 5 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index 2fd45602..f3492415 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -37,7 +37,7 @@
 
 // extern data------------------------------------------
 
-extern u32 bg_char_data[16 * 3];
+extern u32 bg_char_data[16 * 5];
 extern u16 bg_scr_data[32 * 32];
 extern u16 bg_scr_data2[32 * 32];
 
@@ -132,17 +132,6 @@ static void BannerDraw(int cursor, int selected, TitleProperty *titleprop)
 	
 	int l;
 	MtxFx22 mtx;
-	
-	/*
-	static int testcount=0;
-	testcount++;
-    if( (testcount/5)%2 ==1 ) titleprop[1].titleID = 0;//1secごとにTitlePropertyの2を変化させてみる活線挿抜擬似テスト
-    else
-    {
-		titleprop[1].titleID = 1;
-		titleprop[1].pBanner = download_banner;
-	}
-	*/
     
     // TitleProperty弄り
 	for(l=0;l<LAUNCHER_TITLE_LIST_NUM;l++)
@@ -327,9 +316,25 @@ void LauncherLoading( TitleProperty *pTitleList )
 	if(fadecount < 93) fadecount++;
 }
 
+// LauncherMainのSelectSomethingByTPで使うSelectSomethingFuncの実装
+static BOOL SelectCenterFunc( u16 *csr, TPData *tgt )
+{
+	// 単純な実装例
+	int x = 128-32-64-48+2*56;
+	int y = 96-16;
+	if(WithinRangeTP( x, y, x+64, y+64, tgt ))
+	{
+		*csr = (u16)1;
+		return TRUE;
+	}
+	
+	return FALSE;
+}
+
 // ランチャーメイン
 TitleProperty *LauncherMain( TitleProperty *pTitleList )
 {
+	SelectSomethingFunc func[1]={SelectCenterFunc};
 	static BOOL up_bl_bak = FALSE;
 	static BOOL dw_bl_bak = FALSE;
 	BOOL up_bl_trg = FALSE;
@@ -338,6 +343,7 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	BOOL tp_select = FALSE;
 	TitleProperty *ret = NULL;
 	int brightness;
+	u16 dummy;
 	
 	// RTC情報の取得＆表示
 	GetAndDrawRTCData( &g_rtcDraw, FALSE );
@@ -389,12 +395,15 @@ TitleProperty *LauncherMain( TitleProperty *pTitleList )
 	if(s_csr%CURSOR_PER_SELECT == 0){
 		csr_v = 0;
 		selected = s_csr/CURSOR_PER_SELECT;
-	}
-	
-	if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) {					// メニュー項目への分岐
-		if(pTitleList[selected].titleID != 0)
-		{
-			ret = &pTitleList[selected];
+		
+		// このときだけ決定可能
+		tp_select = SelectSomethingByTP(&dummy, func, 1 );
+		
+		if( ( pad.trg & PAD_BUTTON_A ) || ( tp_select ) ) {					// メニュー項目への分岐
+			if(pTitleList[selected].titleID != 0)
+			{
+				ret = &pTitleList[selected];
+			}
 		}
 	}
 	
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
index 7f6e3736..c717f59a 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/MachineSetting.c
@@ -37,7 +37,7 @@
 
 // extern data------------------------------------------
 
-extern u32 bg_char_data[16 * 3];
+extern u32 bg_char_data[16 * 6];
 extern u16 bg_scr_data[32 * 32];
 
 // function's prototype declaration---------------------
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
index 07b1fd17..e6ab76a8 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
+++ b/build/systemMenu_RED/MachineSettings/ARM9/src/setOwnerInfo.c
@@ -73,7 +73,7 @@ typedef enum NameOrComment
 
 // extern data----------------------------------
 
-extern u32 bg_char_data[16 * 3];
+extern u32 bg_char_data[16 * 6];
 extern u16 bg_scr_data[32 * 32];
 extern u16 bg_birth_scr_data[32 * 32];
 
@@ -663,7 +663,7 @@ static void CheckDate( void )
 // 誕生日編集メイン
 static int SetBirthdayMain( void )
 {
-	SelectSomethingFunc func[3]={SelectCancelFunc, SelectOKFunc};
+	SelectSomethingFunc func[2]={SelectCancelFunc, SelectOKFunc};
 	BOOL tp_touch = FALSE;
 	u16 temp_csr;
 	u16 temp_ok_cancel;
diff --git a/build/systemMenu_RED/data/BGData_Launcher.c b/build/systemMenu_RED/data/BGData_Launcher.c
index 57317f34..0141704c 100644
--- a/build/systemMenu_RED/data/BGData_Launcher.c
+++ b/build/systemMenu_RED/data/BGData_Launcher.c
@@ -1,5 +1,5 @@
 // BGキャラクタ
-u32 bg_char_data[16 * 3] = {
+u32 bg_char_data[16 * 5] = {
     0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h
@@ -12,6 +12,8 @@ u32 bg_char_data[16 * 3] = {
     0x11111111, 0x11111111, 0x11111111, 0x11111111,
 };
 
+
+
 // BGスクリーンデータ1
 u16 bg_scr_data[32 * 32]=
 {
diff --git a/build/systemMenu_RED/data/BGData_MachineSettings.c b/build/systemMenu_RED/data/BGData_MachineSettings.c
index 6e319009..3ed2693e 100644
--- a/build/systemMenu_RED/data/BGData_MachineSettings.c
+++ b/build/systemMenu_RED/data/BGData_MachineSettings.c
@@ -1,5 +1,5 @@
 // BGキャラクタ
-u32 bg_char_data[16 * 3] = {
+u32 bg_char_data[16 * 6] = {
     0x00000000, 0x00000000, 0x00000000, 0x00000000,// 0000h
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x11111111, 0x44444444, 0x77777777, 0x99999999,// 0001h