From 9d90fbc6b80ba963db0b4f3267a7681f0dbf4ce3 Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 11:50:34 +1100 Subject: [PATCH 1/6] Update Project64.rdx rdx details for unreleased eurocom game "40 Winks" --- Config/Project64.rdx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Config/Project64.rdx b/Config/Project64.rdx index 5d4523599..e9cfce9bd 100644 --- a/Config/Project64.rdx +++ b/Config/Project64.rdx @@ -41,6 +41,13 @@ ReleaseDate=1998/04/01 Genre=Sport-Snowbd Players=2 ForceFeedback=Yes +[ABA51D09-C668BAD9-C:58] +Good Name=40 Winks (E) (M3) (Beta) +Developer=Eurocom +ReleaseDate=Unreleased +Genre=Platform +Players=1 +ForceFeedback=Yes [B98BA456-5B2B76AF-C:4A] Good Name=64 de Hakken!! Tamagotchi Minna de Tamagotchi World (J) From 7d882f75b6bfe8d05c88abd8e8dc2c992813ac5b Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 11:58:44 +1100 Subject: [PATCH 2/6] Manufacter ID was Media type all along change all relevant code accordingly --- Source/Project64-core/Multilanguage.h | 2 +- .../Multilanguage/LanguageClass.cpp | 4 ++-- Source/Project64-core/RomList/RomList.cpp | 6 +++--- Source/Project64-core/RomList/RomList.h | 2 +- Source/Project64/UserInterface/RomBrowser.h | 2 +- .../UserInterface/RomBrowserClass.cpp | 15 ++++++++------- .../UserInterface/RomInformationClass.cpp | 19 ++++++++++--------- Source/Project64/UserInterface/UIResources.rc | 4 ++-- Source/Project64/UserInterface/resource.h | 4 ++-- 9 files changed, 30 insertions(+), 28 deletions(-) diff --git a/Source/Project64-core/Multilanguage.h b/Source/Project64-core/Multilanguage.h index 8439332c2..6adfd7f92 100644 --- a/Source/Project64-core/Multilanguage.h +++ b/Source/Project64-core/Multilanguage.h @@ -427,7 +427,7 @@ enum LanguageStringID INFO_LOCATION_TEXT = 803, INFO_SIZE_TEXT = 804, INFO_CART_ID_TEXT = 805, - INFO_MANUFACTURER_TEXT = 806, + INFO_MEDIA_TEXT = 806, INFO_COUNTRY_TEXT = 807, INFO_CRC1_TEXT = 808, INFO_CRC2_TEXT = 809, diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp index da3a04829..4691c45cf 100644 --- a/Source/Project64-core/Multilanguage/LanguageClass.cpp +++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp @@ -165,7 +165,7 @@ void CLanguage::LoadDefaultStrings(void) DEF_STR(RB_NOTES_PLUGIN, "Notes (default plugins)"); DEF_STR(RB_NOTES_USER, "Notes (user)"); DEF_STR(RB_CART_ID, "Cartridge ID"); - DEF_STR(RB_MANUFACTUER, "Manufacturer"); + DEF_STR(RB_MANUFACTUER, "Media"); DEF_STR(RB_COUNTRY, "Country"); DEF_STR(RB_DEVELOPER, "Developer"); DEF_STR(RB_CRC1, "CRC1"); @@ -392,7 +392,7 @@ void CLanguage::LoadDefaultStrings(void) DEF_STR(INFO_LOCATION_TEXT, "Location:"); DEF_STR(INFO_SIZE_TEXT, "ROM size:"); DEF_STR(INFO_CART_ID_TEXT, "Cartridge ID:"); - DEF_STR(INFO_MANUFACTURER_TEXT, "Manufacturer:"); + DEF_STR(INFO_MEDIA_TEXT, "Media:"); DEF_STR(INFO_COUNTRY_TEXT, "Country:"); DEF_STR(INFO_CRC1_TEXT, "CRC1:"); DEF_STR(INFO_CRC2_TEXT, "CRC2:"); diff --git a/Source/Project64-core/RomList/RomList.cpp b/Source/Project64-core/RomList/RomList.cpp index 762b326de..c3f3d70a2 100644 --- a/Source/Project64-core/RomList/RomList.cpp +++ b/Source/Project64-core/RomList/RomList.cpp @@ -304,7 +304,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory) RomInfo.CartID[0] = *(RomData + 0x3F); RomInfo.CartID[1] = *(RomData + 0x3E); RomInfo.CartID[2] = '\0'; - RomInfo.Manufacturer = *(RomData + 0x38); + RomInfo.Media = *(RomData + 0x38); RomInfo.Country = *(RomData + 0x3D); RomInfo.CRC1 = *(uint32_t *)(RomData + 0x10); RomInfo.CRC2 = *(uint32_t *)(RomData + 0x14); @@ -535,7 +535,7 @@ bool CRomList::FillRomInfo(ROM_INFO * pRomInfo) pRomInfo->CartID[0] = *(RomData + 0x3F); pRomInfo->CartID[1] = *(RomData + 0x3E); pRomInfo->CartID[2] = '\0'; - pRomInfo->Manufacturer = *(RomData + 0x38); + pRomInfo->Media = *(RomData + 0x38); pRomInfo->Country = *(RomData + 0x3D); pRomInfo->CRC1 = *(uint32_t *)(RomData + 0x10); pRomInfo->CRC2 = *(uint32_t *)(RomData + 0x14); @@ -556,7 +556,7 @@ bool CRomList::FillRomInfo(ROM_INFO * pRomInfo) pRomInfo->CartID[0] = *(RomData + 0x100); pRomInfo->CartID[1] = *(RomData + 0x101); pRomInfo->CartID[2] = *(RomData + 0x102); - pRomInfo->Manufacturer = '\0'; + pRomInfo->Media = '\0'; pRomInfo->Country = *(RomData + 0x100); pRomInfo->CRC1 = 0; for (uint32_t i = 0; i < 0x200; i += 4) diff --git a/Source/Project64-core/RomList/RomList.h b/Source/Project64-core/RomList/RomList.h index e79345391..02bdfe143 100644 --- a/Source/Project64-core/RomList/RomList.h +++ b/Source/Project64-core/RomList/RomList.h @@ -47,7 +47,7 @@ public: int32_t SelColor; uint32_t SelTextColor; int32_t RomSize; - uint8_t Manufacturer; + uint8_t Media; uint8_t Country; uint32_t CRC1; uint32_t CRC2; diff --git a/Source/Project64/UserInterface/RomBrowser.h b/Source/Project64/UserInterface/RomBrowser.h index 8b6116035..b874042f5 100644 --- a/Source/Project64/UserInterface/RomBrowser.h +++ b/Source/Project64/UserInterface/RomBrowser.h @@ -111,7 +111,7 @@ private: RB_FileName = 0, RB_InternalName = 1, RB_GoodName = 2, RB_Name = 3, RB_Status = 4, RB_RomSize = 5, RB_CoreNotes = 6, RB_PluginNotes = 7, RB_UserNotes = 8, - RB_CartridgeID = 9, RB_Manufacturer = 10, RB_Country = 11, + RB_CartridgeID = 9, RB_Media = 10, RB_Country = 11, RB_Developer = 12, RB_Crc1 = 13, RB_Crc2 = 14, RB_CICChip = 15, RB_ReleaseDate = 16, RB_Genre = 17, RB_Players = 18, RB_ForceFeedback = 19, RB_FileFormat = 20 diff --git a/Source/Project64/UserInterface/RomBrowserClass.cpp b/Source/Project64/UserInterface/RomBrowserClass.cpp index eb97be557..dd4672d5c 100644 --- a/Source/Project64/UserInterface/RomBrowserClass.cpp +++ b/Source/Project64/UserInterface/RomBrowserClass.cpp @@ -57,7 +57,7 @@ void CRomBrowser::GetFieldInfo(ROMBROWSER_FIELDS_LIST & Fields, bool UseDefault AddField(Fields, "Notes (default plugins)", 3, RB_PluginNotes, 188, RB_NOTES_PLUGIN, UseDefault); AddField(Fields, "Notes (User)", -1, RB_UserNotes, 100, RB_NOTES_USER, UseDefault); AddField(Fields, "Cartridge ID", -1, RB_CartridgeID, 100, RB_CART_ID, UseDefault); - AddField(Fields, "Manufacturer", -1, RB_Manufacturer, 100, RB_MANUFACTUER, UseDefault); + AddField(Fields, "Media", -1, RB_Media, 100, RB_MANUFACTUER, UseDefault); AddField(Fields, "Country", -1, RB_Country, 100, RB_COUNTRY, UseDefault); AddField(Fields, "Developer", -1, RB_Developer, 100, RB_DEVELOPER, UseDefault); AddField(Fields, "CRC1", -1, RB_Crc1, 100, RB_CRC1, UseDefault); @@ -669,7 +669,7 @@ int32_t CALLBACK CRomBrowser::RomList_CompareItems(uint32_t lParam1, uint32_t lP case RB_PluginNotes: result = (int32_t)lstrcmpiA(pRomInfo1->PluginNotes, pRomInfo2->PluginNotes); break; case RB_UserNotes: result = (int32_t)lstrcmpiA(pRomInfo1->UserNotes, pRomInfo2->UserNotes); break; case RB_CartridgeID: result = (int32_t)lstrcmpiA(pRomInfo1->CartID, pRomInfo2->CartID); break; - case RB_Manufacturer: result = (int32_t)pRomInfo1->Manufacturer - (int32_t)pRomInfo2->Manufacturer; break; + case RB_Media: result = (int32_t)pRomInfo1->Media - (int32_t)pRomInfo2->Media; break; case RB_Country: result = (int32_t)pRomInfo1->Country - (int32_t)pRomInfo2->Country; break; case RB_Developer: result = (int32_t)lstrcmpiA(pRomInfo1->Developer, pRomInfo2->Developer); break; case RB_Crc1: result = (int32_t)pRomInfo1->CRC1 - (int32_t)pRomInfo2->CRC1; break; @@ -712,13 +712,14 @@ void CRomBrowser::RomList_GetDispInfo(uint32_t pnmh) case RB_Status: wcsncpy(lpdi->item.pszText, stdstr(pRomInfo->Status).ToUTF16().c_str(), lpdi->item.cchTextMax / sizeof(wchar_t)); break; case RB_RomSize: swprintf(lpdi->item.pszText, lpdi->item.cchTextMax / sizeof(wchar_t), L"%.1f MBit", (float)pRomInfo->RomSize / 0x20000); break; case RB_CartridgeID: wcsncpy(lpdi->item.pszText, stdstr(pRomInfo->CartID).ToUTF16().c_str(), lpdi->item.cchTextMax / sizeof(wchar_t)); break; - case RB_Manufacturer: - switch (pRomInfo->Manufacturer) + case RB_Media: + switch (pRomInfo->Media) { - case 'C':wcsncpy(lpdi->item.pszText, L"Nintendo", lpdi->item.cchTextMax / sizeof(wchar_t)); break; - case 'N':wcsncpy(lpdi->item.pszText, L"Nintendo", lpdi->item.cchTextMax / sizeof(wchar_t)); break; + case 'C':wcsncpy(lpdi->item.pszText, L"N64 Cartridge (Disk Compatible)", lpdi->item.cchTextMax / sizeof(wchar_t)); break; + case 'N':wcsncpy(lpdi->item.pszText, L"N64 Cartridge", lpdi->item.cchTextMax / sizeof(wchar_t)); break; + case 'Z':wcsncpy(lpdi->item.pszText, L"Aleck64", lpdi->item.cchTextMax / sizeof(wchar_t)); break; case 0: wcsncpy(lpdi->item.pszText, L"None", lpdi->item.cchTextMax / sizeof(wchar_t)); break; - default: swprintf(lpdi->item.pszText, lpdi->item.cchTextMax / sizeof(wchar_t), L"(Unknown %c (%X))", pRomInfo->Manufacturer, pRomInfo->Manufacturer); break; + default: swprintf(lpdi->item.pszText, lpdi->item.cchTextMax / sizeof(wchar_t), L"(Unknown %c (%X))", pRomInfo->Media, pRomInfo->Media); break; } break; case RB_Country: diff --git a/Source/Project64/UserInterface/RomInformationClass.cpp b/Source/Project64/UserInterface/RomInformationClass.cpp index 6104a31e9..edb45a350 100644 --- a/Source/Project64/UserInterface/RomInformationClass.cpp +++ b/Source/Project64/UserInterface/RomInformationClass.cpp @@ -96,7 +96,7 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) SetDlgItemText(hDlg, IDC_ROM_MD5, wGS(INFO_MD5_TEXT).c_str()); SetDlgItemText(hDlg, IDC_ROM_SIZE, wGS(INFO_SIZE_TEXT).c_str()); SetDlgItemText(hDlg, IDC_CART_ID, wGS(INFO_CART_ID_TEXT).c_str()); - SetDlgItemText(hDlg, IDC_MANUFACTURER, wGS(INFO_MANUFACTURER_TEXT).c_str()); + SetDlgItemText(hDlg, IDC_MEDIA, wGS(INFO_MEDIA_TEXT).c_str()); SetDlgItemText(hDlg, IDC_COUNTRY, wGS(INFO_COUNTRY_TEXT).c_str()); SetDlgItemText(hDlg, IDC_CRC1, wGS(INFO_CRC1_TEXT).c_str()); SetDlgItemText(hDlg, IDC_CRC2, wGS(INFO_CRC2_TEXT).c_str()); @@ -116,10 +116,11 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) switch (RomHeader[0x38]) { - case 'C': SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"Nintendo"); break; - case 'N': SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"Nintendo"); break; - case 0: SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"None"); break; - default: SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"(Unknown)"); break; + case 'C': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"N64 Cartridge (Disk Compatible)"); break; + case 'N': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"N64 Cartridge"); break; + case 'Z': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"Aleck64"); break; + case 0: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"None"); break; + default: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"(Unknown)"); break; } switch (RomHeader[0x3D]) @@ -177,7 +178,7 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) //SetDlgItemText(hDlg, IDC_ROM_MD5, wGS(INFO_MD5_TEXT).c_str()); //SetDlgItemText(hDlg, IDC_ROM_SIZE, wGS(INFO_SIZE_TEXT).c_str()); SetDlgItemText(hDlg, IDC_CART_ID, wGS(INFO_CART_ID_TEXT).c_str()); - //SetDlgItemText(hDlg, IDC_MANUFACTURER, wGS(INFO_MANUFACTURER_TEXT).c_str()); + //SetDlgItemText(hDlg, IDC_MEDIA, wGS(INFO_MEDIA_TEXT).c_str()); SetDlgItemText(hDlg, IDC_COUNTRY, wGS(INFO_COUNTRY_TEXT).c_str()); //SetDlgItemText(hDlg, IDC_CRC1, wGS(INFO_CRC1_TEXT).c_str()); //SetDlgItemText(hDlg, IDC_CRC2, wGS(INFO_CRC2_TEXT).c_str()); @@ -197,9 +198,9 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) /*switch (DiskHeader[0x00]) { - case 'N': SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"Nintendo"); break; - case 0: SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"None"); break; - default: SetDlgItemText(hDlg, IDC_INFO_MANUFACTURER, L"(Unknown)"); break; + case 'N': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"Nintendo"); break; + case 0: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"None"); break; + default: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"(Unknown)"); break; }*/ switch (DiskHeader[0x00]) diff --git a/Source/Project64/UserInterface/UIResources.rc b/Source/Project64/UserInterface/UIResources.rc index aacf2ab39..cace73beb 100644 --- a/Source/Project64/UserInterface/UIResources.rc +++ b/Source/Project64/UserInterface/UIResources.rc @@ -184,8 +184,8 @@ BEGIN EDITTEXT IDC_INFO_ROMSIZE,77,74,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Cartridge ID:",IDC_CART_ID,11,90,64,10 EDITTEXT IDC_INFO_CARTID,77,89,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP - LTEXT "Manufacturer:",IDC_MANUFACTURER,11,106,64,10 - EDITTEXT IDC_INFO_MANUFACTURER,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP + LTEXT "Media:",IDC_MEDIA,11,106,64,10 + EDITTEXT IDC_INFO_MEDIA,77,104,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "Country:",IDC_COUNTRY,11,122,64,10 EDITTEXT IDC_INFO_COUNTRY,77,119,153,13,ES_AUTOHSCROLL | ES_READONLY | WS_GROUP LTEXT "CRC1:",IDC_CRC1,11,135,64,10 diff --git a/Source/Project64/UserInterface/resource.h b/Source/Project64/UserInterface/resource.h index cb9f141c7..bba29f874 100644 --- a/Source/Project64/UserInterface/resource.h +++ b/Source/Project64/UserInterface/resource.h @@ -109,7 +109,7 @@ #define IDC_CHK_VADDR 1011 #define IDC_CHK_HEX 1011 #define IDC_DISPLAY_FRAMERATE 1012 -#define IDC_INFO_MANUFACTURER 1012 +#define IDC_INFO_MEDIA 1012 #define IDC_ALT 1012 #define IDC_LIST 1012 #define IDC_HLE_AUDIO 1012 @@ -375,7 +375,7 @@ #define IDC_ROM_SIZE 1194 #define IDC_REG_TABS 1194 #define IDC_CART_ID 1195 -#define IDC_MANUFACTURER 1196 +#define IDC_MEDIA 1196 #define IDC_COUNTRY 1197 #define IDC_CRC1 1198 #define IDC_CRC2 1199 From 6771249eca6ab1e962d8de342105d2d07f3d5c14 Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 12:19:40 +1100 Subject: [PATCH 3/6] Update RomInformationClass.cpp i don't know if this will even work? --- Source/Project64/UserInterface/RomInformationClass.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/Project64/UserInterface/RomInformationClass.cpp b/Source/Project64/UserInterface/RomInformationClass.cpp index edb45a350..dba4586c8 100644 --- a/Source/Project64/UserInterface/RomInformationClass.cpp +++ b/Source/Project64/UserInterface/RomInformationClass.cpp @@ -196,12 +196,13 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) BYTE * DiskHeader = _this->m_pDiskInfo->GetDiskAddressID(); SetDlgItemText(hDlg, IDC_INFO_CARTID, stdstr_f("%c%c", DiskHeader[0x02], DiskHeader[0x01]).ToUTF16().c_str()); - /*switch (DiskHeader[0x00]) + *switch (DiskHeader[0x43670]) { - case 'N': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"Nintendo"); break; + case 'D': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk"); break; + case 'E': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk Expansion"); break; case 0: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"None"); break; default: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"(Unknown)"); break; - }*/ + }* switch (DiskHeader[0x00]) { From 636d39b2917e27788e0d12d368abed3ea8201093 Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 12:26:57 +1100 Subject: [PATCH 4/6] Revert "Update RomInformationClass.cpp" This reverts commit 6771249eca6ab1e962d8de342105d2d07f3d5c14. --- Source/Project64/UserInterface/RomInformationClass.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Project64/UserInterface/RomInformationClass.cpp b/Source/Project64/UserInterface/RomInformationClass.cpp index dba4586c8..edb45a350 100644 --- a/Source/Project64/UserInterface/RomInformationClass.cpp +++ b/Source/Project64/UserInterface/RomInformationClass.cpp @@ -196,13 +196,12 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) BYTE * DiskHeader = _this->m_pDiskInfo->GetDiskAddressID(); SetDlgItemText(hDlg, IDC_INFO_CARTID, stdstr_f("%c%c", DiskHeader[0x02], DiskHeader[0x01]).ToUTF16().c_str()); - *switch (DiskHeader[0x43670]) + /*switch (DiskHeader[0x00]) { - case 'D': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk"); break; - case 'E': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk Expansion"); break; + case 'N': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"Nintendo"); break; case 0: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"None"); break; default: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"(Unknown)"); break; - }* + }*/ switch (DiskHeader[0x00]) { From 1c21979afb9802f7f21c5fb7e37c51be821956e4 Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 12:27:37 +1100 Subject: [PATCH 5/6] Update RomInformationClass.cpp lets just update these id's for now then --- Source/Project64/UserInterface/RomInformationClass.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Project64/UserInterface/RomInformationClass.cpp b/Source/Project64/UserInterface/RomInformationClass.cpp index edb45a350..d2df54d15 100644 --- a/Source/Project64/UserInterface/RomInformationClass.cpp +++ b/Source/Project64/UserInterface/RomInformationClass.cpp @@ -198,7 +198,8 @@ DWORD CALLBACK RomInfoProc(HWND hDlg, DWORD uMsg, DWORD wParam, DWORD lParam) /*switch (DiskHeader[0x00]) { - case 'N': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"Nintendo"); break; + case 'D': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk"); break; + case 'E': SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"64DD Disk Expansion"); break; case 0: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"None"); break; default: SetDlgItemText(hDlg, IDC_INFO_MEDIA, L"(Unknown)"); break; }*/ From 7cbf80ababb8ff138f42c9d31f03f96c754865ab Mon Sep 17 00:00:00 2001 From: Squall Leonhart Date: Mon, 11 Jan 2021 12:59:54 +1100 Subject: [PATCH 6/6] update lang files for media type --- Lang/Arabic.pj.Lang | 4 ++-- Lang/Bosnian.pj.Lang | 4 ++-- Lang/Brazilian Portuguese.pj.Lang | 4 ++-- Lang/Bulgarian.pj.Lang | 4 ++-- Lang/Catalan.pj.Lang | 4 ++-- Lang/Chinese (Simplified).pj.Lang | 4 ++-- Lang/Chinese (Traditional).pj.Lang | 4 ++-- Lang/Czech.pj.Lang | 4 ++-- Lang/Danish.pj.Lang | 4 ++-- Lang/Dutch.pj.Lang | 4 ++-- Lang/English.pj.Lang | 6 +++--- Lang/Finnish.pj.Lang | 4 ++-- Lang/French.pj.Lang | 4 ++-- Lang/German.pj.Lang | 4 ++-- Lang/German_localised.pj.Lang | 4 ++-- Lang/Greek.pj.Lang | 4 ++-- Lang/Hungarian.pj.Lang | 4 ++-- Lang/Italian.pj.Lang | 4 ++-- Lang/Italian_alternative.pj.Lang | 4 ++-- Lang/Japanese.pj.Lang | 4 ++-- Lang/Lithuanian.pj.Lang | 4 ++-- Lang/Norwegian.pj.Lang | 4 ++-- Lang/Polish.pj.Lang | 4 ++-- Lang/Russian.pj.Lang | 4 ++-- Lang/Spanish.pj.Lang | 4 ++-- Lang/Swedish.pj.Lang | 4 ++-- Lang/Turkish.pj.Lang | 4 ++-- Lang/Ukrainian.pj.Lang | 4 ++-- 28 files changed, 57 insertions(+), 57 deletions(-) diff --git a/Lang/Arabic.pj.Lang b/Lang/Arabic.pj.Lang index db66bd9e9..eb75af7d4 100644 --- a/Lang/Arabic.pj.Lang +++ b/Lang/Arabic.pj.Lang @@ -165,7 +165,7 @@ N "ملاحظات (البلجنز الاساسية)" #306# "ملاحظات (المستخدم)" #307# "معرف الكارتج" #308# -"الصانع" #309# +"نوع الوسائط" #309# "البلد" #310# "المطور" #311# #312# "CRC1" @@ -376,7 +376,7 @@ N "المكان:” #803# “حجم الروم:” #804# “اي دي للكارتج اللعبة:” #805# -"الصانع:" #806# +"نوع الوسائط:" #806# “البلد:” #807# #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Bosnian.pj.Lang b/Lang/Bosnian.pj.Lang index df9e9d478..ddbfb50b3 100644 --- a/Lang/Bosnian.pj.Lang +++ b/Lang/Bosnian.pj.Lang @@ -166,7 +166,7 @@ # 306 # "Bilješke (zadani dodaci)" # 307 # "Bilješke (korisnik)" # 308 # "Cartridge ID" -# 309 # "proizvođač" +# 309 # "Vrsta medija" # 310 # "Zemlja" # 311 # "Programer" # 312 # "CRC1" @@ -389,7 +389,7 @@ # 803 # "Lokacija:" # 804 # "Veličina ROM-a:" # 805 # "Cartridge ID:" -# 806 # "Proizvođač:" +# 806 # "Vrsta medija:" # 807 # "Zemlja:" # 808 # "CRC1:" # 809 # "CRC2:" diff --git a/Lang/Brazilian Portuguese.pj.Lang b/Lang/Brazilian Portuguese.pj.Lang index a0e042717..e4d87df42 100644 --- a/Lang/Brazilian Portuguese.pj.Lang +++ b/Lang/Brazilian Portuguese.pj.Lang @@ -165,7 +165,7 @@ #306# "Notas (plugins padrão)" #307# "Notas (usuário)" #308# "ID do Cartucho" -#309# "Fabricante" +#309# "Tipo de mídia" #310# "País" #311# "Desenvolvedor" #312# "CRC1" @@ -387,7 +387,7 @@ #803# "Local:" #804# "Tamanho da ROM:" #805# "ID do cartucho:" -#806# "Fabricante:" +#806# "Tipo de mídia:" #807# "País:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Bulgarian.pj.Lang b/Lang/Bulgarian.pj.Lang index dc93495e8..1f2853a30 100644 --- a/Lang/Bulgarian.pj.Lang +++ b/Lang/Bulgarian.pj.Lang @@ -143,7 +143,7 @@ #306# "Забележки (plugin)" #307# "Забележки (потребител)" #308# "ID на дискетата" -#309# "Производител" +#309# "Тип медия" #310# "Регион" #311# "Разработчик" #312# "CRC1" @@ -289,7 +289,7 @@ #803# "Местоположение" #804# "Размер" #805# "ID на дискетата" -#806# "Производител" +#806# "Тип медия" #807# "Регион" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Catalan.pj.Lang b/Lang/Catalan.pj.Lang index 8c256c37b..580b3839e 100644 --- a/Lang/Catalan.pj.Lang +++ b/Lang/Catalan.pj.Lang @@ -164,7 +164,7 @@ #306# "Notes (complements per defecte)" #307# "Notes (Usuari)" #308# "ID de cartutx" -#309# "Fabricant" +#309# "Tipus de suport" #310# "País" #311# "Desenvolupador" #312# "CRC1" @@ -376,7 +376,7 @@ #803# "Ubicació:" #804# "Mida de ROM:" #805# "ID de cartutx:" -#806# "Fabricant:" +#806# "Tipus de suport:" #807# "País:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 4a31480d3..a0967f226 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -166,7 +166,7 @@ #306# "注释 (默认插件)" #307# "注释 (用户)" #308# "卡带 ID" -#309# "厂商" +#309# "媒体类型" #310# "国家" #311# "开发者" #312# "CRC1" @@ -388,7 +388,7 @@ #803# "路径: " #804# "ROM 容量: " #805# "卡带 ID: " -#806# "厂商: " +#806# "媒体类型: " #807# "国家: " #808# "CRC1: " #809# "CRC2: " diff --git a/Lang/Chinese (Traditional).pj.Lang b/Lang/Chinese (Traditional).pj.Lang index 85edac4a8..d4804fe9d 100644 --- a/Lang/Chinese (Traditional).pj.Lang +++ b/Lang/Chinese (Traditional).pj.Lang @@ -145,7 +145,7 @@ #306# "註解 (預設外掛程式)" #307# "註解 (使用者)" #308# "卡帶 ID" -#309# "製造商" +#309# "媒體類型" #310# "國別" #311# "開發商" #312# "CRC1" @@ -293,7 +293,7 @@ #803# "位置:" #804# "ROM 大小:" #805# "卡帶 ID:" -#806# "製造商:" +#806# "媒體類型:" #807# "國別:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Czech.pj.Lang b/Lang/Czech.pj.Lang index 61757ad8e..c8e96aeff 100644 --- a/Lang/Czech.pj.Lang +++ b/Lang/Czech.pj.Lang @@ -143,7 +143,7 @@ #306# "Poznámka pluginu" #307# "Poznámky (uživatel)" #308# "ID kazety" -#309# "Výrobce" +#309# "Typ média" #310# "Region" #311# "Vývojáø" #312# "CRC1" @@ -289,7 +289,7 @@ RDB není pøítomno nebo volba dole 'pøepsat' je nezaškrtnutá" #803# "Umístìní" #804# "Velikost" #805# "ID kazety" -#806# "Výrobce" +#806# "Typ média" #807# "Region" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Danish.pj.Lang b/Lang/Danish.pj.Lang index 4fb0a0a52..c9beb4e33 100644 --- a/Lang/Danish.pj.Lang +++ b/Lang/Danish.pj.Lang @@ -143,7 +143,7 @@ #306# "Indsats Note" #307# "Noter (bruger)" #308# "Kassette ID" -#309# "Bagmand" +#309# "Medietype" #310# "Region" #311# "Udvikler" #312# "CRC1" @@ -288,7 +288,7 @@ #803# "Sted" #804# "Størrelse" #805# "Kassette ID" -#806# "Bagmand" +#806# "Medietype" #807# "Region" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Dutch.pj.Lang b/Lang/Dutch.pj.Lang index 70cdc9c13..e5721ce12 100644 --- a/Lang/Dutch.pj.Lang +++ b/Lang/Dutch.pj.Lang @@ -143,7 +143,7 @@ #306# "Notities (standaard plugins)" #307# "Notities (gebruiker)" #308# "Cartridge ID" -#309# "Fabrikant" +#309# "Mediatype" #310# "Land" #311# "Ontwikkelaar" #312# "CRC1" @@ -288,7 +288,7 @@ #803# "Locatie:" #804# "ROM Grootte:" #805# "Cartridge ID:" -#806# "Fabrikant:" +#806# "Mediatype:" #807# "Land:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 92f6e6b0a..12c35e894 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -1,4 +1,4 @@ -/********************************************************************************* +/********************************************************************************* * Meta Information * *********************************************************************************/ //About DLL @@ -166,7 +166,7 @@ #306# "Notes (default plugins)" #307# "Notes (user)" #308# "Cartridge ID" -#309# "Manufacturer" +#309# "Media Type" #310# "Country" #311# "Developer" #312# "CRC1" @@ -388,7 +388,7 @@ #803# "Location:" #804# "ROM size:" #805# "Cartridge ID:" -#806# "Manufacturer:" +#806# "Media Type:" #807# "Country:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Finnish.pj.Lang b/Lang/Finnish.pj.Lang index fe84bb875..4e851cca0 100644 --- a/Lang/Finnish.pj.Lang +++ b/Lang/Finnish.pj.Lang @@ -145,7 +145,7 @@ #306# "Merkinnät (oletus plugin tiedostot)" #307# "Merkinnät (käyttäjä)" #308# "Pelikasetin tunnus" -#309# "Valmistaja" +#309# "Mediatyyppi" #310# "Maa" #311# "Kehittäjä" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Sijainti:" #804# "Tiedoston koko:" #805# "Pelikasetin tunnus:" -#806# "Valmistaja:" +#806# "Mediatyyppi:" #807# "Maa:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/French.pj.Lang b/Lang/French.pj.Lang index 166d84a97..7ef7101dd 100644 --- a/Lang/French.pj.Lang +++ b/Lang/French.pj.Lang @@ -165,7 +165,7 @@ #306# "Notes (plugins par défaut)" #307# "Notes (utilisateur)" #308# "ID de la cartouche" -#309# "Constructeur" +#309# "Type de support" #310# "Pays" #311# "Développeur" #312# "CRC1" @@ -387,7 +387,7 @@ #803# "Emplacement :" #804# "Taille de la ROM :" #805# "ID cartouche :" -#806# "Développeur :" +#806# "Type de support :" #807# "Pays :" #808# "CRC1 :" #809# "CRC2 :" diff --git a/Lang/German.pj.Lang b/Lang/German.pj.Lang index 44393ddd3..ae50977d8 100644 --- a/Lang/German.pj.Lang +++ b/Lang/German.pj.Lang @@ -164,7 +164,7 @@ #306# "Vermerke (Plugin)" #307# "Vermerke (Nutzer)" #308# "Cartridge ID" -#309# "Hersteller" +#309# "Medientyp" #310# "Region" #311# "Entwickler" #312# "CRC1" @@ -376,7 +376,7 @@ #803# "Pfad:" #804# "Grösse:" #805# "Cartridge-ID:" -#806# "Hersteller:" +#806# "Medientyp:" #807# "Region:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/German_localised.pj.Lang b/Lang/German_localised.pj.Lang index 41d9e922a..0533548ee 100644 --- a/Lang/German_localised.pj.Lang +++ b/Lang/German_localised.pj.Lang @@ -143,7 +143,7 @@ #306# "Vermerke - Plugin" #307# "Ihre Vermerke in Project64.rdn" #308# "Cartridge ID" -#309# "Hersteller" +#309# "Medientyp" #310# "Region" #311# "Entwickler" #312# "CRC1" @@ -288,7 +288,7 @@ #803# "Pfad" #804# "Grösse" #805# "Cartridge ID" -#806# "Hersteller" +#806# "Medientyp" #807# "Region" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Greek.pj.Lang b/Lang/Greek.pj.Lang index f48338989..c4178cbe2 100644 --- a/Lang/Greek.pj.Lang +++ b/Lang/Greek.pj.Lang @@ -143,7 +143,7 @@ #306# "Σημειώσεις (plugins)" #307# "Σημειώσεις (Χρήστης)" #308# "ID Κασέτας" -#309# "Κατασκευαστής" +#309# "Τύπος πολυμέσων" #310# "Περιοχή" #311# "Δημιουργός" #312# "CRC1" @@ -289,7 +289,7 @@ #803# "Τοποθεσία:" #804# "Μέγεθος ROM:" #805# "ID Κασέτας:" -#806# "Κατασκευαστής:" +#806# "Τύπος πολυμέσων:" #807# "Περιοχή:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Hungarian.pj.Lang b/Lang/Hungarian.pj.Lang index a73e4c550..af897b98e 100644 --- a/Lang/Hungarian.pj.Lang +++ b/Lang/Hungarian.pj.Lang @@ -145,7 +145,7 @@ #306# "Plugin infók" #307# "Felhasználói infók" #308# "N64 kazetta azonosítója" -#309# "Gyártó" +#309# "Média típus" #310# "Terület" #311# "Forgalmazó" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Elérés:" #804# "ROM méret:" #805# "Kazetta azonosítója:" -#806# "Gyártó:" +#806# "Média típus:" #807# "Terület:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Italian.pj.Lang b/Lang/Italian.pj.Lang index a1cad2baf..6a65b08e0 100644 --- a/Lang/Italian.pj.Lang +++ b/Lang/Italian.pj.Lang @@ -145,7 +145,7 @@ #306# "Note (plugins)" #307# "Note (utente)" #308# "ID Cartuccia" -#309# "Produttore" +#309# "Tipo di supporto" #310# "Regione" #311# "Sviluppatore" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Cartella" #804# "Dimensione ROM" #805# "ID Cartuccia" -#806# "Produttore" +#806# "Tipo di supporto" #807# "Regione" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Italian_alternative.pj.Lang b/Lang/Italian_alternative.pj.Lang index 3af6744cb..182338515 100644 --- a/Lang/Italian_alternative.pj.Lang +++ b/Lang/Italian_alternative.pj.Lang @@ -143,7 +143,7 @@ #306# "Note (plugins)" #307# "Note dell'utente)" #308# "ID Cartuccia" -#309# "Produttore" +#309# "Tipo di supporto" #310# "path" #311# "Sviluppatore" #312# "CRC1" @@ -288,7 +288,7 @@ #803# "Path" #804# "Dimensioni" #805# "ID Cartuccia" -#806# "Produttore" +#806# "Tipo di supporto" #807# "Regione" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Japanese.pj.Lang b/Lang/Japanese.pj.Lang index 6f70abbf5..eb96456cf 100644 --- a/Lang/Japanese.pj.Lang +++ b/Lang/Japanese.pj.Lang @@ -178,7 +178,7 @@ #306# "情報（デフォルトプラグイン）" #307# "情報（ユーザー）" #308# "ｶｰﾄﾘｯｼﾞID" -#309# "製造元" +#309# "メディアタイプ" #310# "国情報" #311# "開発元" #312# "CRC1" @@ -391,7 +391,7 @@ #803# "保存場所:" #804# "ロムサイズ:" #805# "カートリッジID:" -#806# "製造元:" +#806# "メディアタイプ:" #807# "国情報:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Lithuanian.pj.Lang b/Lang/Lithuanian.pj.Lang index 0188fd014..d5fa9c7c3 100644 --- a/Lang/Lithuanian.pj.Lang +++ b/Lang/Lithuanian.pj.Lang @@ -145,7 +145,7 @@ #306# "Plugin'o pastaba" #307# "Pastabos (vartotojo)" #308# "Kartridþo ID" -#309# "Gamintojas" +#309# "Medijos tipas" #310# "Regionas" #311# "Kûrëjas" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Vieta" #804# "Dydis" #805# "Kartridþo ID" -#806# "Gamintojas" +#806# "Medijos tipas" #807# "Regionas" #808# "CRC1" #809# "CRC2" diff --git a/Lang/Norwegian.pj.Lang b/Lang/Norwegian.pj.Lang index c74e63fdf..e4634f293 100644 --- a/Lang/Norwegian.pj.Lang +++ b/Lang/Norwegian.pj.Lang @@ -145,7 +145,7 @@ #306# "Notater (standard plugins)" #307# "Notater (bruker)" #308# "Cartridge ID" -#309# "Produsent" +#309# "Media type" #310# "Region" #311# "Utvikler" #312# "CRC1" @@ -294,7 +294,7 @@ De vil ta effekt når ROM'en er resatt eller en ny er startet." #803# "Sted:" #804# "ROM størrelse:" #805# "Cartridge ID:" -#806# "Produsent:" +#806# "Media type:" #807# "Region:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Polish.pj.Lang b/Lang/Polish.pj.Lang index 91a27a9f5..63ae88124 100644 --- a/Lang/Polish.pj.Lang +++ b/Lang/Polish.pj.Lang @@ -145,7 +145,7 @@ #306# "Notes (domyœlne pluginy)" #307# "Notes (u¿ytkownika)" #308# "ID cartridge'a" -#309# "Producent" +#309# "Typ mediów" #310# "Kraj" #311# "Producent" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Folder:" #804# "Rozmiar romu:" #805# "ID cartridge'a:" -#806# "Producent:" +#806# "Typ mediów:" #807# "Kraj:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Russian.pj.Lang b/Lang/Russian.pj.Lang index ab90c9ab8..666b31dab 100644 --- a/Lang/Russian.pj.Lang +++ b/Lang/Russian.pj.Lang @@ -165,7 +165,7 @@ #306# "Примечания - плагины" #307# "Примечания юзера в Project64.rdn" #308# "Код картриджа" -#309# "Изготовитель" +#309# "Тип СМИ" #310# "Регион" #311# "Разработчик" #312# "CRC1" @@ -387,7 +387,7 @@ #803# "Путь к файлу:" #804# "Размер игры:" #805# "Код картриджа:" -#806# "Изготовитель:" +#806# "Тип СМИ:" #807# "Регион:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Spanish.pj.Lang b/Lang/Spanish.pj.Lang index a3cf8beff..6a37293ed 100644 --- a/Lang/Spanish.pj.Lang +++ b/Lang/Spanish.pj.Lang @@ -164,7 +164,7 @@ #306# "Notas (complementos predeterminados)" #307# "Notas (usuario)" #308# "ID del Cartucho" -#309# "Fabricante" +#309# "Tipo de medio" #310# "País" #311# "Desarrollador" #312# "CRC1" @@ -377,7 +377,7 @@ #803# "Ubicación:" #804# "Tamaño de la ROM:" #805# "ID del Cartucho:" -#806# "Fabricante:" +#806# "Tipo de medio:" #807# "País:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Swedish.pj.Lang b/Lang/Swedish.pj.Lang index 620862644..278aac342 100644 --- a/Lang/Swedish.pj.Lang +++ b/Lang/Swedish.pj.Lang @@ -145,7 +145,7 @@ #306# "Anteckningar (standard plugins)" #307# "Anteckningar (användare)" #308# "Förpacknings ID" -#309# "Tillverkare" +#309# "Mediatyp" #310# "Land" #311# "Utvecklare" #312# "CRC1" @@ -292,7 +292,7 @@ #803# "Plats:" #804# "Fil Storlek:" #805# "Förpacknings ID" -#806# "Tillverkare:" +#806# "Mediatyp:" #807# "Land:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Turkish.pj.Lang b/Lang/Turkish.pj.Lang index db021282d..69e75f371 100644 --- a/Lang/Turkish.pj.Lang +++ b/Lang/Turkish.pj.Lang @@ -165,7 +165,7 @@ #306# "Notlar (varsayılan eklentiler)" #307# "Notlar (kullanıcı)" #308# "Kartuş ID'si" -#309# "Üretici" +#309# "Ortam türü" #310# "Ülke" #311# "Geliştirici" #312# "CRC1" @@ -387,7 +387,7 @@ #803# "Bölge:" #804# "ROM boyutu:" #805# "Kartuş ID'si:" -#806# "Üretici:" +#806# "Ortam türü:" #807# "Ülke:" #808# "CRC1:" #809# "CRC2:" diff --git a/Lang/Ukrainian.pj.Lang b/Lang/Ukrainian.pj.Lang index aea9cd443..88e9acb0e 100644 --- a/Lang/Ukrainian.pj.Lang +++ b/Lang/Ukrainian.pj.Lang @@ -145,7 +145,7 @@ #306# "Нотатки - плагіни" #307# "Нотатки юзера в Project64.rdn" #308# "Код касети" -#309# "Виробник" +#309# "Тип носія" #310# "Регіон" #311# "Розробник" #312# "CRC1" @@ -290,7 +290,7 @@ #803# "Шлях до файлу:" #804# "Розмір гри:" #805# "Код касети:" -#806# "Виробник:" +#806# "Тип носія:" #807# "Регіон:" #808# "CRC1:" #809# "CRC2:"