diff --git a/build/tools/MasterEditor/SheetCheckerTWL/Debug/extract_sheet.xsl b/build/tools/MasterEditor/SheetCheckerTWL/Debug/extract_sheet.xsl index 2952996..4857e37 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/Debug/extract_sheet.xsl +++ b/build/tools/MasterEditor/SheetCheckerTWL/Debug/extract_sheet.xsl @@ -33,6 +33,9 @@ + + + diff --git a/build/tools/MasterEditor/SheetCheckerTWL/Release/extract_sheet.xsl b/build/tools/MasterEditor/SheetCheckerTWL/Release/extract_sheet.xsl index 2952996..4857e37 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/Release/extract_sheet.xsl +++ b/build/tools/MasterEditor/SheetCheckerTWL/Release/extract_sheet.xsl @@ -33,6 +33,9 @@ + + + diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb index 3324e65..31c740e 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.ncb differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo index 1e770d8..8dbd2af 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL.suo differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm index 02c7101..d1b92aa 100644 Binary files a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm and b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp index 2cc9579..ff6eaab 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.cpp @@ -125,7 +125,7 @@ int printResult( SheetCheckerContext ^context, ROM_Header *rh, SheetItem ^item, tadver = (tadver << 8) | item->SubmitVersion; // ʏ̕\ - if( !context->bSubmitVersion && !context->bResult && !context->bTadVersion ) + if( !context->bSubmitVersion && !context->bResult && !context->bTadVersion && !context->bUnnecessaryRating ) { Console::WriteLine( "" ); Console::WriteLine( "SRL: " + srlfile ); @@ -140,6 +140,8 @@ int printResult( SheetCheckerContext ^context, ROM_Header *rh, SheetItem ^item, printf( "RemasterVersion: %02X %02X\n", rh->s.rom_version, item->RomVersion ); printf( "File CRC: %04X %04X\n", srlcrc, item->FileCRC ); printf( "---------------------------------------\n" ); + printf( "Rating Display: %s\n", (item->IsUnnecessaryRating)?"Unnecessary":"Necessary" ); + printf( "---------------------------------------\n" ); printf( "SubmitVersion: - %d (%02X)\n", item->SubmitVersion, item->SubmitVersion ); printf( "TAD Version: %d (%04X)\n", tadver, tadver ); printf( "---------------------------------------\n" ); @@ -177,6 +179,17 @@ int printResult( SheetCheckerContext ^context, ROM_Header *rh, SheetItem ^item, printf( "%d", context->ErrorCode ); } } + if( context->bUnnecessaryRating ) + { + if( context->ErrorCode == SheetCheckerError::NOERROR ) + { + printf( "%d", (item->IsUnnecessaryRating)?1:0 ); + } + else + { + printf( "%d", context->ErrorCode ); + } + } if( context->bResult ) { printf( "%d", context->ErrorCode ); @@ -298,6 +311,16 @@ System::Boolean readSheet( System::String ^sheetfile, SheetItem ^item ) { item->SubmitVersion = System::Byte::Parse( text, System::Globalization::NumberStyles::AllowHexSpecifier ); } + + text = getXPathText( root, "/Sheet/IsUnnecessaryRating" ); + if( !System::String::IsNullOrEmpty( text ) && text->Equals( "" ) ) + { + item->IsUnnecessaryRating = true; + } + else + { + item->IsUnnecessaryRating = false; + } } catch( System::Exception ^ex ) { @@ -342,6 +365,11 @@ System::Int32 parseOption( array ^args, SheetCheckerContext ^c context->bTadVersion = true; numopt++; } + else if( args[i]->StartsWith( "-u" ) ) + { + context->bUnnecessaryRating = true; + numopt++; + } else if( !args[i]->StartsWith( "-" ) ) // IvVłȂindexL^ { indexList->Add(i); diff --git a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h index c93760f..483f424 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h +++ b/build/tools/MasterEditor/SheetCheckerTWL/SheetCheckerTWL/SheetCheckerTWL.h @@ -28,6 +28,7 @@ private: System::Boolean ^hbSubmitVersion; // IvVtO System::Boolean ^hbResult; System::Boolean ^hbTadVersion; + System::Boolean ^hbUnnecessaryRating; SheetCheckerError ^hErrorCode; // G[ public: SheetCheckerContext() @@ -52,6 +53,11 @@ public: void set( System::Boolean flg ){ this->hbTadVersion = gcnew System::Boolean(flg); } System::Boolean get(){ return *this->hbTadVersion; } }; + property System::Boolean bUnnecessaryRating + { + void set( System::Boolean flg ){ this->hbUnnecessaryRating = gcnew System::Boolean(flg); } + System::Boolean get(){ return *this->hbUnnecessaryRating; } + }; property SheetCheckerError ErrorCode { void set( SheetCheckerError code ){ this->hErrorCode = gcnew SheetCheckerError(code); } @@ -67,6 +73,7 @@ private: System::Byte ^hRomVersion; System::UInt16 ^hFileCRC; System::Byte ^hSubmitVersion; + System::Boolean ^hIsUnnecessaryRating; public: System::String ^hMedia; public: @@ -78,6 +85,7 @@ public: this->hFileCRC = gcnew System::UInt16(0); this->hSubmitVersion = gcnew System::Byte(0); this->hMedia = gcnew System::String(""); + this->hIsUnnecessaryRating = gcnew System::Boolean(false); } ~SheetItem() { @@ -114,6 +122,11 @@ public: } System::String^ get(){ return System::String::Copy( this->hMedia ); } } + property System::Boolean IsUnnecessaryRating + { + void set( System::Boolean b ){ *this->hIsUnnecessaryRating = b; } + System::Boolean get(){ return *this->hIsUnnecessaryRating; } + } }; diff --git a/build/tools/MasterEditor/SheetCheckerTWL/extract_sheet.xsl b/build/tools/MasterEditor/SheetCheckerTWL/extract_sheet.xsl index 2952996..4857e37 100644 --- a/build/tools/MasterEditor/SheetCheckerTWL/extract_sheet.xsl +++ b/build/tools/MasterEditor/SheetCheckerTWL/extract_sheet.xsl @@ -33,6 +33,9 @@ + + +