diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb index fe09aafa..b01fc8a8 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.ncb and b/build/tools/MasterEditorTWL/MasterEditorTWL.ncb differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL.suo b/build/tools/MasterEditorTWL/MasterEditorTWL.suo index 643de470..be82fd61 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL.suo and b/build/tools/MasterEditorTWL/MasterEditorTWL.suo differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm index 9333bf59..76e63141 100644 Binary files a/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm and b/build/tools/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm differ diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp index 28ccc925..c8ce7dc6 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_deliv.cpp @@ -115,7 +115,14 @@ void Form1::setDeliverableProperties(void) this->hDeliv->hTel1 = this->tboxTel1->Text; this->hDeliv->hFax1 = this->tboxFax1->Text; this->hDeliv->hMail1 = this->tboxMail1->Text; - this->hDeliv->hNTSC1 = this->tboxNTSC1->Text; + if( this->stripItemJapanese->Checked == true ) + { + this->hDeliv->hNTSC1 = this->tboxNTSC1->Text; + } + else + { + this->hDeliv->hNTSC1 = nullptr; + } if( this->cboxIsInputPerson2->Checked == true ) { this->hDeliv->hCompany2 = this->tboxCompany2->Text + " " + this->tboxDepart2->Text; @@ -131,7 +138,14 @@ void Form1::setDeliverableProperties(void) this->hDeliv->hTel2 = this->tboxTel2->Text; this->hDeliv->hFax2 = this->tboxFax2->Text; this->hDeliv->hMail2 = this->tboxMail2->Text; - this->hDeliv->hNTSC2 = this->tboxNTSC2->Text; + if( this->stripItemJapanese->Checked == true ) + { + this->hDeliv->hNTSC2 = this->tboxNTSC2->Text; + } + else + { + this->hDeliv->hNTSC2 = nullptr; + } } else { diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp index a65f890e..f61f5f19 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/Form_lang.cpp @@ -364,17 +364,17 @@ void Form1::changeEnglish(void) this->labArbit2->Text = gcnew System::String( "(Arbitrary)" ); this->labArbit3->Text = gcnew System::String( "(Arbitrary)" ); this->labArbit4->Text = gcnew System::String( "(Arbitrary)" ); - // ふりがな情報を削除 - this->tboxFurigana1->Clear(); + // ふりがな情報を入力できないようにする + //this->tboxFurigana1->Clear(); this->tboxFurigana1->Enabled = false; this->labFurigana1->Text = gcnew System::String( LANG_FURIGANA_E ); - this->tboxFurigana2->Clear(); + //this->tboxFurigana2->Clear(); this->tboxFurigana2->Enabled = false; this->labFurigana2->Text = gcnew System::String( LANG_FURIGANA_E ); this->tboxNTSC1->Enabled = false; - this->tboxNTSC1->Text = gcnew System::String(""); + //this->tboxNTSC1->Text = gcnew System::String(""); this->tboxNTSC2->Enabled = false; - this->tboxNTSC2->Text = gcnew System::String(""); + //this->tboxNTSC2->Text = gcnew System::String(""); this->labNTSC1Pre->Text = gcnew System::String( LANG_NTSC_1_E ); this->labNTSC1Sur->Text = gcnew System::String( LANG_NTSC_2_E ); this->labNTSC2Pre->Text = gcnew System::String( LANG_NTSC_1_E ); diff --git a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp index 40a3973e..da4b8784 100644 --- a/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp +++ b/build/tools/MasterEditorTWL/MasterEditorTWL/srl.cpp @@ -1209,9 +1209,9 @@ ECSrlResult RCSrl::mrcTWL( FILE *fp ) if( !crcret || (crcseg3 != METWL_SEG3_CRC) ) { this->hErrorList->Add( gcnew RCMrcError( - "セグメント3CRC", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, + "セグメント3 CRC", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE, "セグメント3領域に誤りがあります。", - "System-Call Library", "This Library is SDK default one.", false, true ) ); + "Segment-3 CRC", "Invalid data exist in Segment-3 area.", false, true ) ); } u16 NA = this->pRomHeader->s.twl_card_normal_area_rom_offset & 0x7fffUL;