diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL.ncb
index 02e41c0..0c8980f 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 9884fb9..65ac092 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/AssemblyInfo.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
index f9fe5dd..12c8087 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/AssemblyInfo.cpp
@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
// すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
// 既定値にすることができます:
-[assembly:AssemblyVersionAttribute("1.5.*")];
+[assembly:AssemblyVersionAttribute("1.6.*")];
[assembly:ComVisible(false)];
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Debug/BuildLog.htm
index 011759f..16b9145 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/Form1.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
index e706ef6..c129f40 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form1.h
@@ -10,6 +10,7 @@
#include "FormError.h"
#include "Form1_const.h"
#include "message_bank.h"
+#include "middleware_name_list.h"
namespace MasterEditorTWL {
@@ -65,6 +66,9 @@ namespace MasterEditorTWL {
// エラーメッセージ
RCMessageBank ^hMsg;
+ // ミドルウェア名称リスト
+ RCMiddlewareNameList ^hMiddlewareNameList;
+
/////////////////////////////////////////////
// VC自動追加フィールド
/////////////////////////////////////////////
@@ -4233,7 +4237,7 @@ private: System::Windows::Forms::ComboBox^ combGRB;
{
System::Reflection::Assembly ^ass = System::Reflection::Assembly::GetEntryAssembly();
System::Version ^ver = ass->GetName()->Version;
- return ( ver->Major.ToString() + "." + ver->Minor.ToString() + "a" );
+ return ( ver->Major.ToString() + "." + ver->Minor.ToString() );
}
// SRLに登録されないROM仕様のフォーム入力を
@@ -4378,6 +4382,11 @@ private: System::Windows::Forms::ComboBox^ combGRB;
{
return (this->getResDir() + "mrc_msg_e.xml");
}
+ // ミドルウェア名称リストファイル
+ System::String^ getMiddlewareNameListFile(void)
+ {
+ return (this->getResDir() + "middleware_name_list.xml");
+ }
private:
// ----------------------------------------------
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
index db8b1ef..3b2f354 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_constructor.cpp
@@ -41,6 +41,7 @@ void Form1::construct(void)
this->IsReadOnly = false;
this->SizeGboxExFlags = this->gboxExFlags->Size;
this->hMsg = gcnew RCMessageBank( this->getGuiMessageFileJ(), this->getGuiMessageFileE() );
+ this->hMiddlewareNameList = gcnew RCMiddlewareNameList( this->getMiddlewareNameListFile() );
// バージョン情報を表示
//this->labAssemblyVersion->Text = System::Windows::Forms::Application::ProductVersion;
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp
index be87a23..9439948 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_init.cpp
@@ -214,6 +214,18 @@ void Form1::loadAppendInit(void)
u32 relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdk/relstep" ) );
u32 sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
this->hSrl->hMrcExternalCheckItems->SDKVer = sdkver;
+
+ major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/major" ) );
+ minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/minor" ) );
+ relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticTWL/relstep" ) );
+ sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
+ this->hSrl->hMrcExternalCheckItems->SDKVerNotStaticTWL = sdkver;
+
+ major = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/major" ) );
+ minor = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/minor" ) );
+ relstep = System::UInt32::Parse( MasterEditorTWL::getXPathText( root, "/init/sdkNotStaticNTR/relstep" ) );
+ sdkver = (major << 24) | (minor << 16) | (relstep & 0xFFFF);
+ this->hSrl->hMrcExternalCheckItems->SDKVerNotStaticNTR = sdkver;
}
catch ( System::Exception ^ex )
{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp
index 9ca6fab..07a0402 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/Form_mwlist.cpp
@@ -58,6 +58,16 @@ System::Void Form1::makeMiddlewareListXml(System::Xml::XmlDocument^ doc)
System::Xml::XmlElement ^mid = doc->CreateElement( "middleware" );
MasterEditorTWL::appendXmlTag( doc, mid, "publisher", lic->Publisher );
MasterEditorTWL::appendXmlTag( doc, mid, "name", lic->Name );
+ System::String ^note = "";
+ if( this->isJapanese() )
+ {
+ note = this->hMiddlewareNameList->search(lic->Publisher, lic->Name, true );
+ }
+ else
+ {
+ note = this->hMiddlewareNameList->search(lic->Publisher, lic->Name, false );
+ }
+ MasterEditorTWL::appendXmlTag( doc, mid, "note", note );
midlist->AppendChild( mid );
}
}
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj
index 7995e62..b24c5ff 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/MasterEditorTWL.vcproj
@@ -387,6 +387,10 @@
RelativePath=".\message_bank.h"
>
+
+
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h
index f759a63..488d737 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_element.h
@@ -336,6 +336,8 @@ namespace MasterEditorTWL
public:
property System::Boolean IsAppendCheck; // 追加チェックをするかどうか(すべての項目が追加チェックとは限らない)
property System::UInt32 SDKVer; // SDKのバージョン
+ property System::UInt32 SDKVerNotStaticTWL; // SDKのバージョン(TWL常駐モジュール以外)
+ property System::UInt32 SDKVerNotStaticNTR; // SDKのバージョン(NTR常駐モジュール以外)
property System::Boolean IsPermitNormalJump; // ノーマルジャンプがアクセス許可されているか
property cli::array ^hIsPermitShared2Array; // Shared2ファイルアクセスが許可されているか
property cli::array ^hShared2SizeArray; // Shared2ファイルサイズ
@@ -345,6 +347,8 @@ namespace MasterEditorTWL
{
this->IsAppendCheck = false;
this->SDKVer = 0;
+ this->SDKVerNotStaticTWL = 0;
+ this->SDKVerNotStaticNTR = 0;
this->IsPermitNormalJump = false;
this->hIsPermitShared2Array = gcnew cli::array(METWL_NUMOF_SHARED2FILES);
this->hShared2SizeArray = gcnew cli::array(METWL_NUMOF_SHARED2FILES);
diff --git a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
index 51f99b5..cc8618c 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
+++ b/build/tools/MasterEditor/MasterEditorTWL/MasterEditorTWL/srl_mrc.cpp
@@ -888,6 +888,8 @@ void RCSrl::mrcSDKVersion(FILE *fp)
{
// SDKバージョン
System::Boolean isOld = false;
+ System::Boolean isOldExTWL = false;
+ System::Boolean isOldExNTR = false;
System::Boolean isPR = false;
System::Boolean isRC = false;
for each( RCSDKVersion ^sdk in this->hSDKList )
@@ -901,11 +903,34 @@ void RCSrl::mrcSDKVersion(FILE *fp)
isOld = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVer );
}
}
+ else // 常駐モジュール以外
+ {
+ if( this->hMrcExternalCheckItems->IsAppendCheck )
+ {
+ u32 major = sdk->Code >> 24;
+ if( major >= 5 ) // TWLSDK
+ {
+ isOldExTWL = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticTWL );
+ }
+ else // NTRSDK
+ {
+ isOldExNTR = MasterEditorTWL::IsOldSDKVersion( sdk->Code, this->hMrcExternalCheckItems->SDKVerNotStaticNTR );
+ }
+ }
+ }
}
if( isOld )
{
this->hWarnList->Add( this->makeMrcError("SDKVersionOld") );
}
+ if( isOldExTWL )
+ {
+ this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleTwlOld") );
+ }
+ if( isOldExNTR )
+ {
+ this->hWarnList->Add( this->makeMrcError("SDKVersionExModuleNtrOld") );
+ }
if( isPR )
{
this->hWarnList->Add( this->makeMrcError("SDKVersionPR") );
@@ -925,19 +950,7 @@ void RCSrl::mrcBanner(FILE *fp)
u8 mapChina[ 0x10000 ];
u8 mapKorea[ 0x10000 ];
int i;
-/*
- // 本体設定だけはガイドライン無視
- if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) == 0 )
- {
- //this->hWarnList->Add( gcnew RCMrcError(
- // "バナーファイル", METWL_ERRLIST_NORANGE, METWL_ERRLIST_NORANGE,
- // "本体設定アプリに限ってはバナーの文字コードチェックをスキップします。",
- // "Banner File",
- // "Only a machine setting app., a charactor code check of the banner file is skip.",
- // false, true ) );
- return;
- }
-*/
+
// バナーオフセットにエラーがあるときには調べない
if( this->pRomHeader->s.banner_offset == 0 )
{
@@ -978,6 +991,9 @@ void RCSrl::mrcBanner(FILE *fp)
this->hErrorList->Add( this->makeMrcError("BannerRead") );
}
+ // バナーバージョン
+ u8 banner_version = banner[0];
+
// バナーの各文字がマップに登録されているかチェック
System::Boolean bResultWorldwide = true;
System::Boolean bResultChina = true;
@@ -990,7 +1006,7 @@ void RCSrl::mrcBanner(FILE *fp)
code = (code << 8) + banner[i];
// 中国のフォント箇所
- if( (0x840 <= i) && (i < 0x940) )
+ if( (0x840 <= i) && (i < 0x940) && (banner_version >= 2) ) // バナーバージョンが1のときは中国版バナーは読み込まれない
{
if( (mapWorldwide[ code ] == 0) && (mapChina[ code ] == 0) ) // ワールドワイド版が使われててもOK
{
@@ -998,7 +1014,7 @@ void RCSrl::mrcBanner(FILE *fp)
}
}
// 韓国のフォント箇所
- else if( (0x940 <= i) && (i < 0xA40) )
+ else if( (0x940 <= i) && (i < 0xA40) && (banner_version >= 3) )
{
if( (mapWorldwide[ code ] == 0) && (mapKorea[ code ] == 0) )
{
@@ -1016,10 +1032,10 @@ void RCSrl::mrcBanner(FILE *fp)
}
if( !bResultWorldwide )
{
- if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) != 0 ) // 本体設定は特別に許される
- {
+ //if( memcmp( this->pRomHeader->s.game_code, "HNB", 3 ) != 0 ) // 本体設定は特別に許される
+ //{
this->hErrorList->Add( this->makeMrcError("BannerChar") );
- }
+ //}
}
if( !bResultChina )
{
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml
index dcd2d5f..24247c0 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/append_ini.xml
@@ -5,9 +5,19 @@
ON
-
+
5
0
30000
+
+ 5
+ 0
+ 30000
+
+
+ 4
+ 0
+ 30000
+
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl
index 776cb97..a7edd3b 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware.xsl
@@ -19,7 +19,7 @@
font-weight: bold;
}
hr {
- width: 700px;
+ width: 1000px;
margin-left: 0;
}
tr {
@@ -34,7 +34,10 @@
width: 200px;
}
th.name {
- width: 500px;
+ width: 400px;
+ }
+ th.note {
+ width: 400px;
}
td {
font-weight: normal;
@@ -75,6 +78,7 @@
| Publisher |
Middleware Name |
+ Note |
@@ -86,6 +90,7 @@
|
|
+ |
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl
index 958d9f9..95dd2e4 100644
--- a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_e.xsl
@@ -19,7 +19,7 @@
font-weight: bold;
}
hr {
- width: 700px;
+ width: 1000px;
margin-left: 0;
}
tr {
@@ -34,7 +34,10 @@
width: 200px;
}
th.name {
- width: 500px;
+ width: 400px;
+ }
+ th.note {
+ width: 400px;
}
td {
font-weight: normal;
@@ -75,6 +78,7 @@
| Publisher |
Middleware Name |
+ Note |
@@ -86,6 +90,7 @@
|
|
+ |
diff --git a/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_name_list.xml b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_name_list.xml
new file mode 100644
index 0000000..873af24
--- /dev/null
+++ b/build/tools/MasterEditor/MasterEditorTWL/resource/middleware_name_list.xml
@@ -0,0 +1,165 @@
+
+
+ 1.6
+
+
+ MEI
+ libASR
+ 髻ｳ螢ｰ隱崎ｭ倥お繝ｳ繧ｸ繝ｳ for NINTENDO DS (繝代リ繧ｽ繝九ャ繧ｯ)
+
+
+
+
+ MEI
+ ASR
+ 髻ｳ螢ｰ隱崎ｭ倥お繝ｳ繧ｸ繝ｳ for NINTENDO DS (繝代リ繧ｽ繝九ャ繧ｯ)
+
+
+
+
+ Panasonic
+ ASR
+ 髻ｳ螢ｰ隱崎ｭ倥お繝ｳ繧ｸ繝ｳ for NINTENDO DS (繝代リ繧ｽ繝九ャ繧ｯ)
+
+
+
+
+ Panasonic
+ libASR
+ 髻ｳ螢ｰ隱崎ｭ倥お繝ｳ繧ｸ繝ｳ for NINTENDO DS (繝代リ繧ｽ繝九ャ繧ｯ)
+
+
+
+
+ Actimagine
+ VX
+ VX MiddleWare for NINTENDO DS (Actimagine)
+ VX MiddleWare for NINTENDO DS (Actimagine)
+
+
+
+ NINTENDO
+ DWC
+ TWL-DWC (莉ｻ螟ｩ蝣)
+
+
+
+
+ NINTENDO
+ WiFi
+ TWL-WiFi (莉ｻ螟ｩ蝣)
+
+
+
+
+ MEI
+ libHWR_FULL
+ 謇区嶌縺崎ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ (譚ｾ荳)
+
+
+
+
+ Panasonic
+ libHWR_FULL
+ 謇区嶌縺崎ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ (譚ｾ荳)
+
+
+
+
+ Zi Corporation
+ DLTLIB
+ Decuma謇区嶌譁蟄苓ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ譌･譛ｬ隱樒沿 (Zi Corporation)
+
+
+
+
+ Zi Corporation
+ SCRLIB
+ Decuma謇区嶌譁蟄苓ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ闍ｱ隱樒沿 (Zi Corporation)
+
+
+
+
+ Zi Corporation
+ MCRLIB
+ Decuma謇区嶌譁蟄苓ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ闍ｱ隱樒沿 (Zi Corporation)
+
+
+
+
+ JUSTSYSTEM
+ ATOK
+ DS逕ｨATOK繝ｩ繧､繝悶Λ繝ｪ (繧ｸ繝｣繧ｹ繝医す繧ｹ繝繝)
+
+
+
+
+ Abiosso
+ VoiceChat
+ VoiceChat繝ｩ繧､繝悶Λ繝ｪ for NINTENDO DS (Abiosso)
+
+
+
+
+ SHARP
+ SHTTS
+ SHARP髻ｳ螢ｰ蜷域舌Λ繧､繝悶Λ繝ｪ
+
+
+
+
+ ACCESS
+ NFC
+ NetFront 繝悶Λ繧ｦ繧ｶ繧ｳ繝ｳ繝昴ｼ繝阪Φ繝 HTTP/HTTPS繝励Ο繝医さ繝ｫ
+
+
+
+
+ ACCESS
+ NFB
+ NetFront 繝悶Λ繧ｦ繧ｶ繧ｳ繝ｳ繝昴ｼ繝阪Φ繝
+
+
+
+
+ TMC
+ MP3Decoder_
+ MP3繧ｳ繝ｼ繝繝繧ｯ繝ｩ繧､繝悶Λ繝ｪ (繝繧ｯ繝弱槭そ繝槭ユ繧｣繧ｫ繝ｫ)
+
+
+
+
+ Actimagine
+ Mobiclip
+ Mobiclip Middleware for NINTENDO DS (Actimagine)
+ Mobiclip Middleware for NINTENDO DS (Actimagine)
+
+
+
+ OKI
+ FSE
+ TWL逕ｨ 鬘碑ｪ崎ｭ倥Λ繧､繝悶Λ繝ｪ (豐夜崕豌)
+
+
+
+
+ TOSHIBA
+ SPConv
+ 繧ｹ繝斐ｼ繝√さ繝ｳ繝舌ｼ繧ｿ for DS (譚ｱ闃)
+
+
+
+
+ NINTENDO
+ M4A
+ MPEG4Systems Demux 繝ｩ繧､繝悶Λ繝ｪ (CEVA+SHARP+莉ｻ螟ｩ蝣)
+
+
+
+
+ NINTENDO
+ AAC-LC
+ AAC-LC Decoder 繝ｩ繧､繝悶Λ繝ｪ (CEVA+SHARP+莉ｻ螟ｩ蝣)
+
+
+