From fc52f1763d1dc0df8d82f8b03e254023265074ad Mon Sep 17 00:00:00 2001
From: yoshida_teruhisa <yoshida_teruhisa@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Thu, 13 Mar 2008 06:55:52 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9?=
 =?UTF-8?q?=E3=82=A4=E3=83=83=E3=83=81DO=5FNOT=5FSHOW=5FLAUNCHER=E3=81=A7?=
 =?UTF-8?q?=E3=80=81GUI=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?Launcher=E3=82=92=E3=83=93=E3=83=AB=E3=83=89=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4=20=E3=83=BBLaunch?=
 =?UTF-8?q?er=E3=81=AE=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88=E3=82=92Select+?=
 =?UTF-8?q?Start+X=E3=81=AB=E5=A4=89=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@878 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/Makefile       |  4 ++++
 build/systemMenu_RED/Launcher/ARM9/src/launcher.c |  2 +-
 build/systemMenu_RED/Launcher/ARM9/src/main.c     | 11 +++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index b37a3784..32279b96 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -77,6 +77,10 @@ endif
 
 MAKETAD_FLAGS			+= -s
 
+ifdef DO_NOT_SHOW_LAUNCHER
+MACRO_FLAGS += -DDO_NOT_SHOW_LAUNCHER
+endif
+
 include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs
 include	$(TWLSDK_ROOT)/build/libraries/reboot/commondefs.reboot
 
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
index 8ab79519..a009ac0e 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/launcher.c
@@ -558,7 +558,7 @@ static TitleProperty *ProcessPads( TitleProperty *pTitleList )
 		s_wavstop = FALSE;
 	}
 
-	if( pad.trg & PAD_BUTTON_B ) {
+	if( (pad.cont & (PAD_BUTTON_START | PAD_BUTTON_SELECT | PAD_BUTTON_X )) == (PAD_BUTTON_START | PAD_BUTTON_SELECT | PAD_BUTTON_X ) ) {
 		OS_DoApplicationJump( NULL, OS_APP_JUMP_NORMAL );
 	}
 	
diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c
index 21c92200..e4a3dc2b 100644
--- a/build/systemMenu_RED/Launcher/ARM9/src/main.c
+++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c
@@ -183,6 +183,17 @@ void TwlMain( void )
         state = LOGODEMO_INIT;
     }
 
+// ランチャーを絶対表示しないバージョン
+#ifdef DO_NOT_SHOW_LAUNCHER
+	if(direct_boot == FALSE)
+	{
+		state = STOP;
+	}else
+	{
+		state = LOAD_START;
+	}
+#endif
+
     // チャンネルをロックする
     SND_LockChannel((1 << L_CHANNEL) | (1 << R_CHANNEL), 0);