diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb index ee1aaf6..485b649 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo index 0d9a9e0..44f34ad 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 0b920b0..f590b8d 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp index 4d55074..c333f89 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -718,7 +718,7 @@ ECSrlResult RCSrl::decryptRomHeader( ROM_Header *prh ) // (1) 公開鍵で復号した結果(ブロック)をローカル変数(original)に格納 // (2) ブロックから余分な部分を取り除いて引数(pDst)にコピー - ECAppType type = this->selectAppType(); + ECAppType type = this->selectAppType( prh ); // 鍵を選ぶ #ifdef METWL_VER_APPTYPE_LAUNCHER @@ -776,12 +776,12 @@ ECSrlResult RCSrl::decryptRomHeader( ROM_Header *prh ) // ------------------------------------------------------------------- // アプリ種別の判定 // ------------------------------------------------------------------- -ECAppType RCSrl::selectAppType(void) +ECAppType RCSrl::selectAppType( ROM_Header *prh ) { ECAppType type = ECAppType::ILLEGAL; - u8 *idL = this->pRomHeader->s.titleID_Lo; - u32 idH = this->pRomHeader->s.titleID_Hi; + u8 *idL = prh->s.titleID_Lo; + u32 idH = prh->s.titleID_Hi; if( (idL[3]=='H') && (idL[2]=='N') && (idL[1]=='A') ) // ランチャアプリかどうかはTitleID_Loの値で決定 { diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h index 831c804..fdfbf69 100644 --- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h +++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl.h @@ -419,7 +419,7 @@ namespace MasterEditorTWL // @arg [in] 入力ファイルのFP (->SRL読み込み時に実行されるべき)] ECSrlResult searchSDKVersion( FILE *fp ); // SDKバージョンを取得する ECSrlResult searchLicenses( FILE *fp ); // 使用ライセンスを取得する - ECAppType selectAppType(void); + ECAppType selectAppType( ROM_Header *prh ); // TitleIDからアプリ種別を決定する // MRC(Master ROM Checker)機能 ECSrlResult mrc( FILE *fp );