diff --git a/Source/Core/Core/CoreParameter.cpp b/Source/Core/Core/CoreParameter.cpp index a8effe8a08..6907667b46 100644 --- a/Source/Core/Core/CoreParameter.cpp +++ b/Source/Core/Core/CoreParameter.cpp @@ -181,7 +181,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = EUR_DIR; break; - case DiscIO::IVolume::COUNTRY_SDK: case DiscIO::IVolume::COUNTRY_UNKNOWN: default: if (PanicYesNoT("Your GCM/ISO file seems to be invalid (invalid country)." @@ -265,7 +264,6 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2) Region = EUR_DIR; break; - case DiscIO::IVolume::COUNTRY_SDK: case DiscIO::IVolume::COUNTRY_UNKNOWN: default: bNTSC = false; diff --git a/Source/Core/DiscIO/Volume.h b/Source/Core/DiscIO/Volume.h index 09442c89df..c15be880ea 100644 --- a/Source/Core/DiscIO/Volume.h +++ b/Source/Core/DiscIO/Volume.h @@ -50,7 +50,6 @@ public: COUNTRY_RUSSIA, COUNTRY_SPAIN, COUNTRY_TAIWAN, - COUNTRY_SDK, COUNTRY_UNKNOWN, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DiscIO/VolumeCommon.cpp b/Source/Core/DiscIO/VolumeCommon.cpp index 69a9cc8981..0956f119c9 100644 --- a/Source/Core/DiscIO/VolumeCommon.cpp +++ b/Source/Core/DiscIO/VolumeCommon.cpp @@ -62,9 +62,6 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) case 'T': // Korea with English language return IVolume::COUNTRY_KOREA; - case 'O': - return IVolume::COUNTRY_SDK; - case 'W': return IVolume::COUNTRY_TAIWAN; diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 0826c04b22..d730a788b6 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -33,7 +33,6 @@ void Resources::Init() m_regions[DiscIO::IVolume::COUNTRY_KOREA].load(dir + SL("Flag_Korea.png")); m_regions[DiscIO::IVolume::COUNTRY_NETHERLANDS].load(dir + SL("Flag_Netherlands.png")); m_regions[DiscIO::IVolume::COUNTRY_RUSSIA].load(dir + SL("Flag_Russia.png")); - m_regions[DiscIO::IVolume::COUNTRY_SDK].load(dir + SL("Flag_SDK.png")); m_regions[DiscIO::IVolume::COUNTRY_SPAIN].load(dir + SL("Flag_Spain.png")); m_regions[DiscIO::IVolume::COUNTRY_TAIWAN].load(dir + SL("Flag_Taiwan.png")); m_regions[DiscIO::IVolume::COUNTRY_UNKNOWN].load(dir + SL("Flag_Unknown.png")); diff --git a/Source/Core/DolphinWX/GameListCtrl.cpp b/Source/Core/DolphinWX/GameListCtrl.cpp index d95daa8d62..ede17e799f 100644 --- a/Source/Core/DolphinWX/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/GameListCtrl.cpp @@ -74,7 +74,6 @@ #include "DolphinWX/resources/Flag_Korea.xpm" #include "DolphinWX/resources/Flag_Netherlands.xpm" #include "DolphinWX/resources/Flag_Russia.xpm" -#include "DolphinWX/resources/Flag_SDK.xpm" #include "DolphinWX/resources/Flag_Spain.xpm" #include "DolphinWX/resources/Flag_Taiwan.xpm" #include "DolphinWX/resources/Flag_Unknown.xpm" @@ -236,7 +235,6 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex[DiscIO::IVolume::COUNTRY_KOREA] = m_imageListSmall->Add(wxBitmap(Flag_Korea_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_NETHERLANDS] = m_imageListSmall->Add(wxBitmap(Flag_Netherlands_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_RUSSIA] = m_imageListSmall->Add(wxBitmap(Flag_Russia_xpm)); - m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SPAIN] = m_imageListSmall->Add(wxBitmap(Flag_Spain_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm)); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm)); diff --git a/Source/Core/DolphinWX/ISOFile.cpp b/Source/Core/DolphinWX/ISOFile.cpp index b4dbdf91d2..41345ccdcb 100644 --- a/Source/Core/DolphinWX/ISOFile.cpp +++ b/Source/Core/DolphinWX/ISOFile.cpp @@ -37,7 +37,7 @@ #include "DolphinWX/ISOFile.h" #include "DolphinWX/WxUtils.h" -static const u32 CACHE_REVISION = 0x116; +static const u32 CACHE_REVISION = 0x117; #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 diff --git a/Source/Core/DolphinWX/ISOProperties.cpp b/Source/Core/DolphinWX/ISOProperties.cpp index 487ab94544..cccd86e539 100644 --- a/Source/Core/DolphinWX/ISOProperties.cpp +++ b/Source/Core/DolphinWX/ISOProperties.cpp @@ -253,9 +253,6 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW m_Lang->Disable(); } break; - case DiscIO::IVolume::COUNTRY_SDK: - m_Country->SetValue(_("No Country (SDK)")); - break; case DiscIO::IVolume::COUNTRY_UNKNOWN: default: m_Country->SetValue(_("UNKNOWN")); diff --git a/Source/Core/DolphinWX/resources/Flag_SDK.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm deleted file mode 100644 index 169caacdcc..0000000000 --- a/Source/Core/DolphinWX/resources/Flag_SDK.xpm +++ /dev/null @@ -1,114 +0,0 @@ -/* XPM */ -static const char * Flag_SDK_xpm[] = { -"96 32 79 1", -" c None", -". c #000000", -"+ c #FFFFFF", -"@ c #E9E9FE", -"# c #5959FE", -"$ c #1515FE", -"% c #0505FE", -"& c #1313FE", -"* c #3232FE", -"= c #0000FF", -"- c #0202FE", -"; c #0C0CFE", -"> c #2B2BFE", -", c #7676FE", -"' c #EEEEFE", -") c #D4D4FE", -"! c #1C1CFE", -"~ c #0303FE", -"{ c #9292FE", -"] c #5151FE", -"^ c #B1B1FE", -"/ c #F8F8FE", -"( c #CCCCFE", -"_ c #E5E5FE", -": c #9393FE", -"< c #0A0AFE", -"[ c #2424FE", -"} c #EAEAFE", -"| c #C2C2FE", -"1 c #1010FE", -"2 c #0D0DFE", -"3 c #B6B6FE", -"4 c #0F0FFE", -"5 c #8989FE", -"6 c #6767FE", -"7 c #ACACFE", -"8 c #0808FE", -"9 c #1E1EFE", -"0 c #D2D2FE", -"a c #5F5FFE", -"b c #9C9CFE", -"c c #E8E8FE", -"d c #DDDDFE", -"e c #1A1AFE", -"f c #9494FE", -"g c #3636FE", -"h c #E7E7FE", -"i c #B7B7FE", -"j c #0707FE", -"k c #A4A4FE", -"l c #F7F7FE", -"m c #B0B0FE", -"n c #FCFCFE", -"o c #C4C4FE", -"p c #8181FE", -"q c #2020FE", -"r c #1B1BFE", -"s c #0101FE", -"t c #0606FE", -"u c #AEAEFE", -"v c #E2E2FE", -"w c #8787FE", -"x c #0404FE", -"y c #A2A2FE", -"z c #3E3EFE", -"A c #A8A8FE", -"B c #F9F9FE", -"C c #5656FE", -"D c #E6E6FE", -"E c #B4B4FE", -"F c #0909FE", -"G c #9696FE", -"H c #4D4DFE", -"I c #2222FE", -"J c #1D1DFE", -"K c #6969FE", -"L c #0E0EFE", -"M c #2D2DFE", -"N c #7575FE", -" ", -" ", -" ", -" ", -"................................ ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".+@#$%&*+++==-;>,'+++==+++)!~{+. ", -".+]=^/(]+++==+_:<[}++==++|123++. ", -".+4=_++++++==+++5=6++==+7890+++. ", -".+9=&abc+++==+++d=e++==f-gh++++. ", -".+ie===jk++==+++l=%++====m+++++. ", -".++nopq=!++==+++d=r++==:stu++++. ", -".+++++v=1++==+++w=6++==+kx~y+++. ", -".+zAcB7=C++==+D:<[}++==++EFsG++. ", -".+HI;%JK'++==~LMN'+++==+++|4=w+. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" "};