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);