diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb index a43244c..039e838 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.ncb differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo index 4254d08..1300389 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker.suo differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm index 57ccfcf..589a627 100644 Binary files a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm and b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp index 3bca60c..ead5032 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.cpp @@ -28,6 +28,39 @@ void DebugPrint( System::String ^fmt, ... cli::array ^args ) // ------------------------------------------------------------------ // ROMヘッダ中の値の解釈 // ------------------------------------------------------------------ +System::String^ getRegionString(System::UInt32 region) +{ + if( region == METWL_MASK_REGION_ALL ) + { + return (gcnew System::String("ALL")); + } + + System::String ^str = ""; + if( region & METWL_MASK_REGION_JAPAN ) + { + str += "Japan "; + } + if( region & METWL_MASK_REGION_AMERICA ) + { + str += "America "; + } + if( region & METWL_MASK_REGION_EUROPE ) + { + str += "Europe "; + } + if( region & METWL_MASK_REGION_AUSTRALIA ) + { + str += "Australia "; + } + if( region & METWL_MASK_REGION_KOREA ) + { + str += "Korea "; + } + str = str->TrimEnd( ' ' ); + str = str->Replace( ' ', ',' ); + return str; +} + System::String^ getOgnString(int ogn) { System::String ^str = nullptr; diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h index b047fbf..783ef83 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check.h @@ -24,6 +24,7 @@ System::Void checkRom( System::String ^orgSrl, System::String ^targetSrl ); System::Void checkSheet( SheetItem ^sItem ); // ROMヘッダの値を解釈 +System::String^ getRegionString(System::UInt32 region); System::String^ getOgnString(int ogn); System::String^ getRatingString( u8 rating ); diff --git a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp index bb9bf16..205e5fc 100644 --- a/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp +++ b/build/tools/MasterEditor/MasterEditorTWLChecker/MasterEditorTWLChecker/check_rom.cpp @@ -52,7 +52,7 @@ System::Void checkRom( System::String ^orgSrl, System::String ^targetSrl ) Console::WriteLine( "--" ); // リージョンの表示 - Console::WriteLine( "{0,-15} {1,-20:X04}", "Region", rh.s.card_region_bitmap ); + Console::WriteLine( "{0,-15} {1,-10:X04} {2}", "Region", rh.s.card_region_bitmap, getRegionString(rh.s.card_region_bitmap) ); Console::WriteLine( "--" ); // レーティングの表示