diff --git a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c index 69ad7ef9..7ec4e61c 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/src/title.c +++ b/build/libraries_sysmenu/sysmenu/ARM9/src/title.c @@ -1025,6 +1025,13 @@ static AuthResult SYSMi_AuthenticateTWLHeader( TitleProperty *pBootTitle, ROM_He } } +static s32 s_nam_error = NAM_OK; + +s32 SYSMi_getCheckTitleLaunchRightsResult( void ) +{ + return s_nam_error; +} + // TWLアプリ、NTR拡張NANDアプリ 共通の認証 static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle ) { @@ -1040,6 +1047,7 @@ static AuthResult SYSMi_AuthenticateTWLTitle( TitleProperty *pBootTitle ) s32 result = NAM_CheckTitleLaunchRights( pBootTitle->titleID ); if( NAM_OK != result) { + s_nam_error = result; OS_TPrintf("Authenticate failed: NAM_CheckTitleLaunchRights failed. %d \n",result); return AUTH_RESULT_CHECK_TITLE_LAUNCH_RIGHTS_FAILED; }else diff --git a/build/systemMenu_RED/Launcher/ARM9/src/main.c b/build/systemMenu_RED/Launcher/ARM9/src/main.c index 3f451062..a011aaaa 100644 --- a/build/systemMenu_RED/Launcher/ARM9/src/main.c +++ b/build/systemMenu_RED/Launcher/ARM9/src/main.c @@ -345,16 +345,19 @@ void TwlMain( void ) // [TODO:]クリアしたほうが良いデータ(鍵など)があれば消す // デバグ表示 - if( !SYSM_IsLauncherHidden() ) - { - LauncherInit( s_titleList ); - NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); - G2_ChangeBlendAlpha( 0, 31 ); - PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED! - %d\n",res ); - PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] ); - GX_DispOn(); - GXS_DispOn(); + LauncherInit( s_titleList ); + GX_SetVisiblePlane( GX_PLANEMASK_BG0 ); + NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_NULL ); + G2_ChangeBlendAlpha( 0, 31 ); + PrintfSJIS( 1, 25, TXT_COLOR_RED,"LAUNCHER : ERROR OCCURRED! - %d\n",res ); + PrintfSJIS( 1, 40, TXT_COLOR_RED,"%s",error_msg[res] ); + // 特殊表示 + if(res == AUTH_RESULT_CHECK_TITLE_LAUNCH_RIGHTS_FAILED) + { + PrintfSJIS( 1, 55, TXT_COLOR_RED,"NAM result = %d", SYSMi_getCheckTitleLaunchRightsResult() ); } + GX_DispOn(); + GXS_DispOn(); break; } diff --git a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h index 5d87817b..70f2b853 100644 --- a/include/sysmenu/sysmenu_lib/common/sysmenu_api.h +++ b/include/sysmenu/sysmenu_lib/common/sysmenu_api.h @@ -137,6 +137,8 @@ extern BOOL SYSM_CheckNintendoLogo( u16 *pLogoData ); // Nintendo extern void SYSM_LoadNintendoLogo2D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_2D形式でロード(pTempBufferには0x700bytes必要) extern void SYSM_LoadNintendoLogo1D( u16 *pLogoData, u16 *pDst, int paletteColorIndex ); // NintendoロゴデータをOBJ_1D形式でロード(同上) +extern s32 SYSMi_getCheckTitleLaunchRightsResult( void ); // CheckTitleLaunchRightsの結果を返す(デバグ用) + #endif // 状態チェック