diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f8a6f13ecb..c90ee4a381 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -56,6 +56,7 @@ public: COUNTRY_TAIWAN, COUNTRY_SDK, COUNTRY_UNKNOWN, + COUNTRY_GERMANY, NUMBER_OF_COUNTRIES }; diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp index f3389aea42..415af2725a 100644 --- a/Source/Core/DiscIO/Src/VolumeCommon.cpp +++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp @@ -28,10 +28,12 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) // PAL case 'D': // German + return IVolume::COUNTRY_GERMANY; + break; + case 'X': // Used by a couple PAL games case 'Y': // German, french - case 'L': // Japanese import to PAL regions case 'M': // Japanese import to PAL regions case 'S': // Spanish-speaking regions diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 6f75674c29..2312d6afa3 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -37,6 +37,7 @@ #include "Main.h" #include "../resources/Flag_Europe.xpm" +#include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" #include "../resources/Flag_Italy.xpm" #include "../resources/Flag_Japan.xpm" @@ -44,6 +45,8 @@ #include "../resources/Flag_Taiwan.xpm" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" +#include "../resources/Flag_SDK.xpm" + #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" #include "../resources/Platform_Gamecube.xpm" @@ -192,6 +195,8 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex.resize(DiscIO::IVolume::NUMBER_OF_COUNTRIES); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(wxBitmap(Flag_Europe_xpm), wxNullBitmap); + m_FlagImageIndex[DiscIO::IVolume::COUNTRY_GERMANY] = + m_imageListSmall->Add(wxBitmap(Flag_Germany_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(wxBitmap(Flag_France_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = @@ -205,7 +210,7 @@ void CGameListCtrl::InitBitmaps() m_FlagImageIndex[DiscIO::IVolume::COUNTRY_TAIWAN] = m_imageListSmall->Add(wxBitmap(Flag_Taiwan_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_SDK] = - m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); + m_imageListSmall->Add(wxBitmap(Flag_SDK_xpm), wxNullBitmap); m_FlagImageIndex[DiscIO::IVolume::COUNTRY_UNKNOWN] = m_imageListSmall->Add(wxBitmap(Flag_Unknown_xpm), wxNullBitmap); diff --git a/Source/Core/DolphinWX/Src/ISOFile.cpp b/Source/Core/DolphinWX/Src/ISOFile.cpp index a00ce2c496..2d4b202272 100644 --- a/Source/Core/DolphinWX/Src/ISOFile.cpp +++ b/Source/Core/DolphinWX/Src/ISOFile.cpp @@ -36,7 +36,7 @@ #include "ChunkFile.h" #include "../resources/no_banner.cpp" -#define CACHE_REVISION 0x10D +#define CACHE_REVISION 0x10E #define DVD_BANNER_WIDTH 96 #define DVD_BANNER_HEIGHT 32 diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png deleted file mode 100644 index c41352f36a..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Europe.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index def46811a6..3ab8534066 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,83 +1,95 @@ /* XPM */ -static const char *const Flag_Europe_xpm[] = { -"96 32 48 1", +static const char * Flag_Europe_xpm[] = { +"96 32 60 1", " c None", ". c #000000", -"+ c #0000FD", -"@ c #0000FF", -"# c #0808F7", -"$ c #5C5CA3", -"% c #1717E8", -"& c #767680", -"* c #EDED00", -"= c #A5A54D", -"- c #2E2EB9", -"; c #96961A", -"> c #4A4A8E", -", c #0000FB", -"' c #0000F4", -") c #0808EC", -"! c #5C5C9B", -"~ c #1717DD", -"{ c #0000EE", -"] c #767677", -"^ c #A5A547", -"/ c #0000DD", -"( c #2E2EA0", -"_ c #969616", -": c #4A4A7B", -"< c #0000D2", -"[ c #0000C6", -"} c #0808BF", -"| c #5C5C7E", -"1 c #1717B4", -"2 c #0000B9", -"3 c #76765C", -"4 c #A5A537", -"5 c #0808B3", -"6 c #5C5C76", -"7 c #1717A8", -"8 c #0000A9", -"9 c #2E2E7A", -"0 c #969611", -"a c #4A4A5E", -"b c #767654", -"c c #A5A533", -"d c #000097", -"e c #2E2E6D", -"f c #96960F", -"g c #4A4A54", -"h c #000081", -"i c #000077", -" ", +"+ c #003399", +"@ c #013498", +"# c #33527A", +"$ c #32527B", +"% c #103D90", +"& c #707555", +"* c #1B4389", +"= c #C9AC20", +"- c #C9AC21", +"; c #6F7556", +"> c #083994", +", c #E6BB0F", +"' c #4D606B", +") c #0B3A92", +"! c #4F616A", +"~ c #E5BB0F", +"{ c #16408C", +"] c #023597", +"^ c #737954", +"/ c #E7BE0F", +"( c #0D3A91", +"_ c #E8BE0E", +": c #727854", +"< c #2F4F7D", +"[ c #445B70", +"} c #455C6F", +"| c #2E4E7D", +"1 c #465D6F", +"2 c #CCAD1E", +"3 c #18418B", +"4 c #CBAD1E", +"5 c #2D4F7E", +"6 c #C0A626", +"7 c #C0A625", +"8 c #0E3B91", +"9 c #50636A", +"0 c #053696", +"a c #506369", +"b c #80804D", +"c c #E6BE0E", +"d c #083794", +"e c #E7BE0E", +"f c #7F7F4D", +"g c #103B8F", +"h c #17408B", +"i c #E5BB10", +"j c #485D6E", +"k c #0C3992", +"l c #0B3892", +"m c #495E6D", +"n c #E4BB10", +"o c #777B51", +"p c #264982", +"q c #C7AA21", +"r c #C6A923", +"s c #767A52", +"t c #3B5675", +"u c #3A5576", " ", " ", " ", " ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++++@#$@+++++++++++++. ", +".++++++++++%&*+=-+*;%++++++++++. ", +".++++++++++>,'+))+!~>++++++++++. ", +".+++++++++{+]]++++]]+{+++++++++. ", +".++++++++^/(++++++++(_:++++++++. ", +".++++++++<[++++++++++}|++++++++. ", +".++++++++]++++++++++++]++++++++. ", +".+++++++123++++++++++341+++++++. ", +".+++++++56++++++++++++75+++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++890++++++++0a8++++++++. ", +".++++++++bcd++++++++def++++++++. ", +".++++++++))+g++++++g+))++++++++. ", +".++++++++++hij+kl+mnh++++++++++. ", +".+++++++++++op@qr@ps+++++++++++. ", +".++++++++++++++tu++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png deleted file mode 100644 index 3390ee79c2..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_France.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 51cde44d8c..1d71b3430d 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,80 +1,40 @@ /* XPM */ -static const char *const Flag_France_xpm[] = { -"96 32 45 1", +static const char * Flag_France_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #0000FF", +"+ c #002395", "@ c #FFFFFF", -"# c #FF0000", -"$ c #0000FC", -"% c #0000F8", -"& c #FCFCFC", -"* c #FC0000", -"= c #0000F2", -"- c #F8F8F8", -"; c #F80000", -"> c #0000EC", -", c #F2F2F2", -"' c #F20000", -") c #0000E3", -"! c #ECECEC", -"~ c #EC0000", -"{ c #0000DB", -"] c #E3E3E3", -"^ c #E30000", -"/ c #0000D2", -"( c #DBDBDB", -"_ c #DB0000", -": c #0000C8", -"< c #D2D2D2", -"[ c #D20000", -"} c #0000BD", -"| c #C8C8C8", -"1 c #C80000", -"2 c #0000B1", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #0000A3", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #000093", -"9 c #A3A3A3", -"0 c #A30000", -"a c #000080", -"b c #939393", -"c c #930000", -"d c #000077", -"e c #808080", -"f c #800000", -" ", +"# c #ED2939", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm new file mode 100644 index 0000000000..e178b30edf --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -0,0 +1,41 @@ +/* XPM */ +static const char * Flag_Germany_xpm[] = { +"96 32 6 1", +" c None", +". c #000000", +"+ c #4A0000", +"@ c #DD0000", +"# c #F48A00", +"$ c #FFCE00", +" ", +" ", +" ", +" ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".##############################. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png deleted file mode 100644 index aa0ea79d31..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Italy.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index c47c87791a..d0832f2d8a 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,80 +1,40 @@ /* XPM */ -static const char *const Flag_Italy_xpm[] = { -"96 32 45 1", +static const char * Flag_Italy_xpm[] = { +"96 32 5 1", " c None", ". c #000000", -"+ c #006F00", +"+ c #009246", "@ c #FFFFFF", -"# c #FF0000", -"$ c #006C00", -"% c #006800", -"& c #FCFCFC", -"* c #FC0000", -"= c #006200", -"- c #F8F8F8", -"; c #F80000", -"> c #005C00", -", c #F2F2F2", -"' c #F20000", -") c #005300", -"! c #ECECEC", -"~ c #EC0000", -"{ c #004B00", -"] c #E3E3E3", -"^ c #E30000", -"/ c #004200", -"( c #DBDBDB", -"_ c #DB0000", -": c #003800", -"< c #D2D2D2", -"[ c #D20000", -"} c #002D00", -"| c #C8C8C8", -"1 c #C80000", -"2 c #002100", -"3 c #BDBDBD", -"4 c #BD0000", -"5 c #001C00", -"6 c #B1B1B1", -"7 c #B10000", -"8 c #001500", -"9 c #A3A3A3", -"0 c #A30000", -"a c #001200", -"b c #939393", -"c c #930000", -"d c #000F00", -"e c #808080", -"f c #800000", -" ", +"# c #CE2B37", " ", " ", " ", " ", "................................ ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".++++++++++@@@@@@@@@@@#########. ", -".$$$$$$$$$$@@@@@@@@@@@#########. ", -".%%%%%%%%%%&&&&&&&&&&&*********. ", -".==========-----------;;;;;;;;;. ", -".>>>>>>>>>>,,,,,,,,,,,'''''''''. ", -".))))))))))!!!!!!!!!!!~~~~~~~~~. ", -".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ", -".//////////(((((((((((_________. ", -".::::::::::<<<<<<<<<<<[[[[[[[[[. ", -".}}}}}}}}}}|||||||||||111111111. ", -".222222222233333333333444444444. ", -".555555555566666666666777777777. ", -".888888888899999999999000000000. ", -".aaaaaaaaaabbbbbbbbbbbccccccccc. ", -".ddddddddddeeeeeeeeeeefffffffff. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png deleted file mode 100644 index 183275cd85..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Japan.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index 47be025c6b..bdd86a6882 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,74 +1,34 @@ /* XPM */ -static const char * const Flag_Japan_xpm[] = { -"96 32 67 1", +static const char * Flag_Japan_xpm[] = { +"96 32 28 1", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #FECACA", -"# c #FD8080", -"$ c #FD6161", -"% c #FD7676", -"& c #FEB6B6", -"* c #FEFEFE", -"= c #FFEDED", -"- c #FF4C4C", -"; c #FF0000", -"> c #FF2F2F", -", c #FFD7D7", -"' c #FEF5F5", -") c #FE2E2E", -"! c #FE1313", -"~ c #FEDDDD", -"{ c #F9F9F9", -"] c #FC7777", -"^ c #FD4545", -"/ c #F4F4F4", -"( c #F4F3F3", -"_ c #FA1313", -": c #FB0000", -"< c #FA0000", -"[ c #F4D4D4", -"} c #EFEFEF", -"| c #EFCFCF", -"1 c #F10000", -"2 c #EF9F9F", -"3 c #E4E4E4", -"4 c #E2BEBE", -"5 c #DD0000", -"6 c #E19090", -"7 c #D9D9D9", -"8 c #D8D0D0", -"9 c #CA0404", -"0 c #CA0000", -"a c #D5A9A9", -"b c #D0D0D0", -"c c #BC4242", -"d c #B40000", -"e c #B71A1A", -"f c #CFCFCF", -"g c #C6C6C6", -"h c #BEA7A7", -"i c #990808", -"j c #980000", -"k c #B78787", -"l c #BBBBBB", -"m c #A88989", -"n c #7B0B0B", -"o c #770000", -"p c #780202", -"q c #9E6B6B", -"r c #AEAEAE", -"s c #A89C9C", -"t c #8F4E4E", -"u c #7F1B1B", -"v c #7A0A0A", -"w c #7D1515", -"x c #8B4242", -"y c #A48F8F", -"z c #A0A0A0", -"A c #8F8F8F", -"B c #7C7C7C", -" ", +"@ c #FDF9FA", +"# c #E497A9", +"$ c #CA3458", +"% c #C0113B", +"& c #CA3559", +"* c #E498AA", +"= c #FEFAFB", +"- c #F8E4E9", +"; c #C93155", +"> c #BC002D", +", c #C93256", +"' c #F8E5EA", +") c #FDF7F8", +"! c #C82E53", +"~ c #C93055", +"{ c #FDF8F9", +"] c #E18EA2", +"^ c #E290A4", +"/ c #CA375A", +"( c #BF0B36", +"_ c #BF0D38", +": c #CB385B", +"< c #E394A7", +"[ c #E396A9", +"} c #BE0733", " ", " ", " ", @@ -77,26 +37,27 @@ static const char * const Flag_Japan_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++@#$%&*++++++++++++. ", -".++++++++++=-;;;;;>,+++++++++++. ", -".*********');;;;;;;!~**********. ", -".{{{{{{{{{];;;;;;;;;^{{{{{{{{{{. ", -".////////(_:::::::::<[/////////. ", -".}}}}}}}}|111111111112}}}}}}}}}. ", -".333333334555555555556333333333. ", -".77777777890000000000a777777777. ", -".bbbbbbbbbcdddddddddefbbbbbbbbb. ", -".ggggggggghijjjjjjjjkgggggggggg. ", -".llllllllllmnooooopqlllllllllll. ", -".rrrrrrrrrrrstuvwxyrrrrrrrrrrrr. ", -".zzzzzzzzzzzzzzzzzzzzzzzzzzzzzz. ", -".AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA. ", -".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@#$%%&*=+++++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++)!>>>>>>>>~{+++++++++. ", +".+++++++++]>>>>>>>>>>^+++++++++. ", +".+++++++++$>>>>>>>>>>/+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++&>>>>>>>>>>:+++++++++. ", +".+++++++++<>>>>>>>>>>[+++++++++. ", +".+++++++++{!>>>>>>>>~@+++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++++@#$}}&*=+++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 7b51bc78ef..26ebd9fa24 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,248 +1,134 @@ /* XPM */ -static const char *const Flag_Korea_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 210 2", -". c Black", -"p c #CACACA", -"= c #D9D9D9", -"a c #EED0D6", -">. c #770730", -"e c #F7F7F7", -"^ c #4B4B4B", -"}. c #5A5A5A", -"OX c #A0A4A8", -"k. c #878787", -"P c #D38494", -"u. c #161951", -"@ c #E1E1E1", -"{. c #353535", -"X c #FFFFFF", -"-. c #71163F", -"g c #E3A3AE", -"0 c #444444", -"t c #535353", -"%X c #626262", -"g. c #011F5A", -"x. c #3D557C", -"P. c #475D7F", -"C. c #8F8F8F", -"B c #B80020", -"$. c #949CB0", -"# c #9E9E9E", -".. c #B60323", -"N c #B6001A", -"C c #B6001B", -"k c #5B5B5B", -"`. c #6A6A6A", -"/ c #797979", -"*. c #AD0B2A", -"6 c #888888", -"2X c #979797", -"f c #D5667A", -"w. c #843656", -"Q c #BD2D47", -"y. c #16396E", -"+. c #D3D3D3", -"9. c #002F6C", -"$ c #E2E2E2", -"s. c #002C65", -"` c #D0C6CD", -"x c #F1F1F1", -"S. c #363636", -"=. c #B20927", -"F c #454545", -"W. c #959DA6", -"n. c #00295F", -"l c #545454", -"v. c #002962", -",. c #C0344C", -"J. c #00265A", -"2. c #7394AE", -"Z c #C53851", -"Q. c #3E5375", -";X c #9F9F9F", -"H. c #002358", -"z. c #C2C4C6", -"j c #AEAEAE", -"V. c #BDBDBD", -"e. c #D7B8BA", -"( c #CCCCCC", -"U c #B2001E", -"$X c #2F2F2F", -"; c #F9F9F9", -"! c #E1C0C6", -"v c #4D4D4D", -"@X c #6B6B6B", -"< c #7A7A7A", -"3. c #412554", -"c. c #001D59", -"q c #898989", -" c #656565", -"6X c #838383", -"1X c #929292", -"F. c #223A67", -"B. c #747D96", -"i. c #471E4A", -"Z. c #A1A1A1", -"N. c #0E275D", -"n c #B0B0B0", -"8. c #072C66", -"| c #B90928", -"!. c #072657", -"'. c #313131", -"b. c #002B62", -":X c #404040", -"y c #4F4F4F", -"2 c #6D6D6D", -"R c #B70C2D", -"3X c #8B8B8A", -"q. c #151C56", -"{ c #B00B2B", -"w c #C7C7C7", -"4. c #930326", -"z c #D6D6D6", -"^. c #001F53", -", c #484848", -"D. c #939CA9", -"% c #575757", -"p. c #302152", -"s c #DC8696", -"V c #B7001E", -"X. c #B7001F", -"d c #D35C72", -"H c #B1B1B1", -"#. c #DEDEDE", -"G. c #00164F", -"R. c #323232", -"1 c #FCFCFC", -"<. c #DBCBCE", -" . c #B80A29", -"D c #9B9B9B", -"T. c #B9B9B9", -"a. c #062A62", -"W c #B30018", -"O. c #E1E2E2", -"m c #D88695", -"1. c #D7D7D7", -"XX c #808A97", -"A c #E4BAC2", -"oX c #858E99", -"]. c #3A3A3A", -"+X c #585858", -"r c #949494", -" X c #ADAEAE", -"o. c #C66174", -"~ c #C1C1C1", -"L c #DADBDB", -"8 c #D0D0D0", -"t. c #92A0B1", -"=X c #333333", -"- c #FDFDFD", -"*X c #424242", -"u c #515151", -"#X c #606060", -"6. c #B40723", -"K c #7E7E7E", -"* c #8D8D8D", -"h. c #5A4F73", -"Y. c #BABABA", -"0. c #00306C", -"@. c #D8D8D8", -"S c #E7E7E7", -"|. c #2C2C2C", -">X c #3B3B3B", -"m. c #002A60", -"[ c #B20A2B", -"d. c #002A62", -"f. c #002A63", -"/. c #16315F", -"M c #BC1231", -"4 c #595959", -".X c #959BA2", -"] c #AD001C", -"h c #F3E6E9", -"7X c #959594", -"4X c #959595", -"Y c #B70B2E", -"o c #B3B3B3", -"A. c #C2C2C2", -"E c #B7082A", -"I c #B50E29", -"r. c #D1D1D1", -"U. c #252525", -"M. c #00215A", -"~. c #001E52", -"K. c #001E55", -"9 c #525252", -"G c #616161", -"[. c #7F7F7F", -"&X c #8E8E8E", -"j. c #D1C8C7", -"(. c #5F7088", -/* pixels */ -" ", +static const char * Flag_Korea_xpm[] = { +"96 32 99 2", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #FDFDFD", +"# c #E2E2E2", +"$ c #313131", +"% c #BABABA", +"& c #BBBBBB", +"* c #505050", +"= c #777777", +"- c #3F3F3F", +"; c #868686", +"> c #F9F9F9", +", c #3E3E3E", +"' c #5B5B5B", +") c #A1A1A1", +"! c #545454", +"~ c #2E2E2E", +"{ c #7D7D7D", +"] c #5F5F5F", +"^ c #5E5E5E", +"/ c #7E7E7E", +"( c #434343", +"_ c #9C9C9C", +": c #A5A5A5", +"< c #E4E4E4", +"[ c #292929", +"} c #636363", +"| c #717171", +"1 c #2B2B2B", +"2 c #F0F0F0", +"3 c #EEB6C0", +"4 c #D44964", +"5 c #C81537", +"6 c #C81638", +"7 c #D54C66", +"8 c #EEB7C1", +"9 c #F1F1F1", +"0 c #8D8D8D", +"a c #626262", +"b c #E8E8E8", +"c c #A0A0A0", +"d c #4B4B4B", +"e c #B0B0B0", +"f c #E17E91", +"g c #C60C30", +"h c #E28395", +"i c #B2B2B2", +"j c #C9C9C9", +"k c #E4B0BD", +"l c #707070", +"m c #A54367", +"n c #C10D32", +"o c #BD0D34", +"p c #D54D67", +"q c #52285E", +"r c #6A1E52", +"s c #093374", +"t c #023378", +"u c #50245B", +"v c #C7193C", +"w c #0A3275", +"x c #761C4D", +"y c #602155", +"z c #003478", +"A c #812351", +"B c #353973", +"C c #653E6F", +"D c #A38BA8", +"E c #B196B0", +"F c #323232", +"G c #555555", +"H c #6D5985", +"I c #6C5885", +"J c #565656", +"K c #ECECEC", +"L c #282828", +"M c #666666", +"N c #939393", +"O c #A68FAA", +"P c #373A73", +"Q c #0E3274", +"R c #0D3374", +"S c #363A73", +"T c #A891AC", +"U c #E9E9E9", +"V c #949494", +"W c #676767", +"X c #B1B1B1", +"Y c #646464", +"Z c #808080", +"` c #4F4F4F", +" . c #A6A6A6", +".. c #B7B7B7", +"+. c #787878", +"@. c #333333", +"#. c #EBEBEB", +"$. c #444444", +"%. c #CECECE", " ", " ", " ", " ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X . ", -". X X X X X X o O + X X X X X X X X X X X X @ # $ X X X X X X . ", -". X X X X X @ % & * = - X X X X X X X X ; : > , < X X X X X X . ", -". 1 1 1 1 1 2 3 4 5 6 7 1 1 1 1 1 1 1 1 8 9 0 3 q w 1 1 1 1 1 . ", -". e e e e r t y u i p e e a s d f g h e + j k 2 3 l z e e e e . ", -". x x x x c v l b n x x m M N B V C Z A x S D F & G H x x x x . ", -". 7 7 7 7 7 O J K L 7 P I U Y T R E W Q ! 7 ~ ^ / ( 7 7 7 7 7 . ", -". ) ) ) ) ) ) ( _ ) ` ' ] [ { } | ...X.o.) O.+.@.) ) ) ) ) ) . ", -". #.#.#.#.#.#.#.#.#.$.%.&.*.=.=.-.;.:.>.,.<.#.#.#.#.#.#.#.#.#.. ", -". 1.1.1.1.1.1.1.1.1.2.3.4.5.6.7.8.9.0.q.w.e.1.1.1.1.1.1.1.1.1.. ", -". r.r.r.r.r.r.r.r.r.t.y.u.i.p.a.s.d.f.g.h.j.r.r.r.r.r.r.r.r.r.. ", -". p p p p p p k.l.p z.x.c.v.b.n.n.m.M.N.B.p V.C.Z.p p p p p p . ", -". A.A.A.A.H 2 S.& l.A.D.F.G.H.J.J.K.L.P.I.A.C.U.y k.Y.A.A.A.A.. ", -". T.T.T.T.9 5 , R.2 E.T.W.Q.!.~.^./.(.).T._.`.u '.].[.T.T.T.T.. ", -". n n n n C.{.}.4 |./ n n X.XXXoXOXn n Z.+Xb @X#Xv n n n n n . ", -". l.l.l.l.l.G 5 $X'.%XD l.l.l.l.l.l.l.l.&X*X$X=X9 -Xl.l.l.l.l.. ", -". ;X;X;X;X;X;X:X>X,X + + + + + + + + > ; , = ' + + + + + + . ", +". + + + + + ) ! ~ { ] + + + + + + + + + + ^ / ( _ : + + + + + . ", +". + + + + < [ } | 1 2 + + 3 4 5 6 7 8 + + 9 0 | a [ < + + + + . ", +". + + + + b c - d e + + f g g g g g g h + + i d - c b + + + + . ", +". + + + + + + j | + + k g g g g g g g g 8 + + l j + + + + + + . ", +". + + + + + + + + + + m g g g g g n o g p + + + + + + + + + + . ", +". + + + + + + + + + + q g g g g r s t u v + + + + + + + + + + . ", +". + + + + + + + + + + w x n o y z z z z A + + + + + + + + + + . ", +". + + + + + + + + + + B z z z z z z z z C + + + + + + + + + + . ", +". + + + + + + j | + + D z z z z z z z z E + + l j + + + + + + . ", +". + + + + b c F G e + + H z z z z z z I + + i J $ c b + + + + . ", +". + + + + K L M N F b + + O P Q R S T + + U 0 V W [ K + + + + . ", +". + + + + + X M Y Z ` + + + + + + + + + + ` Z a ...+ + + + + . ", +". + + + + + + * +.@.0 > + + + + + + + + > 0 @.= ' + + + + + + . ", +". + + + + + + #.$.%.+ + + + + + + + + + + + %.$.#.+ + + + + + . ", +". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", +". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", " ", " ", " ", " ", " ", -" ", -" " -}; +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_SDK.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm new file mode 100644 index 0000000000..169caacdcc --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_SDK.xpm @@ -0,0 +1,114 @@ +/* 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+. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png deleted file mode 100644 index c71920f92c..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Taiwan.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index f0670e4bc4..19aa7cc4f6 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,124 +1,67 @@ /* XPM */ -static const char *const Flag_Taiwan_xpm[] = { -"96 32 89 1", +static const char * Flag_Taiwan_xpm[] = { +"96 32 32 1", " c None", ". c #000000", -"# c #000099", -"$ c #000098", -"% c #03039A", -"& c #000094", -"' c #05059B", -"( c #050095", -") c #DC0014", -"* c #FF0000", -"+ c #FD0001", -", c #04049B", -"- c #000096", -"! c #020299", -"0 c #2424A7", -"1 c #04049A", -"2 c #000097", -"3 c #000093", -"4 c #6262BF", -"5 c #2828A8", -"6 c #6C6CC1", -"7 c #3E3EB1", -"8 c #3B3BB0", -"9 c #00008F", -": c #01019A", -"; c #1919A3", -"< c #4040B0", -"= c #6363C0", -"> c #D6D6EE", -"? c #D9D9ED", -"@ c #C5C5E7", -"A c #3F3FB0", -"B c #3D3DAF", -"C c #020297", -"D c #010199", -"E c #5E5EBE", -"F c #DFDFF2", -"G c white", -"H c #BFBFE5", -"I c #2626A7", -"J c #4242B0", -"K c #7D7DCA", -"L c #FAFAFD", -"M c #FBFBFD", -"N c #FCFCFD", -"O c #FCFCFE", -"P c #DADAF0", -"Q c #6A6AC2", -"R c #1B1BA3", -"S c #000199", -"T c #0E0E9B", -"U c #5858BC", -"V c #D3D3ED", -"W c #2727A6", -"X c #060699", -"Y c #1212A0", -"Z c #6464C0", -"[ c #8080CC", -"] c #F4F4FA", -"^ c #F8F8FB", -"_ c #7070C4", -"` c #4949B5", -"a c #000095", -"b c #040499", -"c c #000092", -"d c #6767C2", -"e c #8686CA", -"f c #7070C5", -"g c #2B2BA9", -"h c #00009A", -"i c #01049C", -"j c #1619A4", -"k c #393CB3", -"l c #00029A", -"m c #1619A5", -"n c #020096", -"o c #DB0014", -"p c #FC0001", -"q c #0A0092", -"r c #060090", -"s c #0B0092", -"t c #0F008E", -"u c #DD0013", -"v c #FD0000", -"w c #E5000F", -"x c #E6010F", -"y c #E60110", -"z c #FB0002", -"{ c #FE0000", -" ", +"+ c #000095", +"@ c #FE0000", +"# c #050597", +"$ c #2727A5", +"% c #2A2AA6", +"& c #6A6AC1", +"* c #A4A4D9", +"= c #6B6BC1", +"- c #2929A6", +"; c #3636AB", +"> c #8181CA", +", c #9595D3", +"' c #D4D4ED", +") c #9494D2", +"! c #8282CB", +"~ c #3535AB", +"{ c #2B2BA7", +"] c #7F7FC9", +"^ c #FFFFFF", +"/ c #7E7ECA", +"( c #040497", +"_ c #3C3CAE", +": c #8080C9", +"< c #7F7FCA", +"[ c #9494D3", +"} c #2C2CA7", +"| c #5454B8", +"1 c #9F9FD7", +"2 c #5555B8", +"3 c #2828A6", " ", " ", " ", " ", "................................ ", -".#####$%#&'$$$##()*+***********. ", -".###$$,-!0&1!$##()*+***********. ", -".##$#23456789:$#()*+***********. ", -".###2;<=>?@ABCD#()*+***********. ", -".###$CEFGGGHI&D$()*+***********. ", -".##D-JKLMNOPQR-S()*+***********. ", -".###$TUGGNGVWX$#()*+***********. ", -".###2YZ[]^P_`aD$()*+***********. ", -".###$bcdEefg3D$#()*+***********. ", -".hhhhhijiklm#hhhno*p***********. ", -".qqqqqqrsrqrqqqqtu*v***********. ", -".wwwwwwxwywxwwwwwz*{***********. ", -".******************************. ", -".{{{{{{{{{{{{{{{{{*{***********. ", -".******************************. ", -".******************************. ", -".******************************. ", -".******************************. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".+++++#+$+#+++++@@@@@@@@@@@@@@@. ", +".+++++%&*=-+++++@@@@@@@@@@@@@@@. ", +".++++;>,')!~++++@@@@@@@@@@@@@@@. ", +".++++{]^^^/{++++@@@@@@@@@@@@@@@. ", +".+++(_:^^^<_(+++@@@@@@@@@@@@@@@. ", +".++++;>[')!~++++@@@@@@@@@@@@@@@. ", +".+++++}|12{+++++@@@@@@@@@@@@@@@. ", +".+++++#+3+#+++++@@@@@@@@@@@@@@@. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png deleted file mode 100644 index 2803a73a3d..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_USA.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 0a991bd02e..2b1d466240 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,65 +1,128 @@ /* XPM */ static const char * Flag_USA_xpm[] = { -"96 32 30 1", -" c None", -". c #000000", -"+ c #0000FF", -"@ c #CE7070", -"# c #B0BF99", -"$ c #F1F1F1", -"% c #FFFFFF", -"& c #0000FD", -"* c #CF8484", -"= c #DA9090", -"- c #0000F3", -"; c #B0BF96", -"> c #0000DF", -", c #0000CB", -"' c #B0BF8C", -") c #D98E8E", -"! c #0000B5", -"~ c #CA6C6C", -"{ c #000098", -"] c #B0BF80", -"^ c #000077", -"/ c #C26464", -"( c #DBDBDB", -"_ c #C17676", -": c #B55757", -"< c #BBBBBB", -"[ c #AC6161", -"} c #A34545", -"| c #8B8B8B", -"1 c #8E4343", -" ", -" ", -" ", -" ", -" ", -"................................ ", -".++++++++++++++@@@@@@@@@@@@@@@@. ", -".+#+#+#+#+#+#++$%%%%%%%%%%%%%%%. ", -".&&&&&&&&&&&&&&*===============. ", -".-;-;-;-;-;-;--@@@@@@@@@@@@@@@@. ", -".>>>>>>>>>>>>>>$%%%%%%%%%%%%%%%. ", -".,',',',',',',,*))))))))))))))). ", -".!!!!!!!!!!!!!!@~~~~~~~~~~~~~~~. ", -".{]{]{]{]{]{]{{$$$$$$$$$$$$$$$$. ", -".^^^^^^^^^^^^^^****************. ", -".^^^^^^^^^^^^^^@///////////////. ", -".((((((((((((((((((((((((((((((. ", -".______________________________. ", -".::::::::::::::::::::::::::::::. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[. ", -".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".||||||||||||||||||||||||||||||. ", -".111111111111111111111111111111. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +"96 32 93 2", +" c None", +". c #000000", +"+ c #4C4B79", +"@ c #54537F", +"# c #4E4E7C", +"$ c #52517E", +"% c #4F4E7C", +"& c #504F7D", +"* c #51517E", +"= c #4F4E7D", +"- c #51517F", +"; c #4D4C7C", +"> c #52527F", +", c #4B4A79", +"' c #B22234", +") c #53527F", +"! c #5F5E89", +"~ c #616089", +"{ c #60608A", +"] c #616088", +"^ c #606088", +"/ c #605F87", +"( c #52517F", +"_ c #D58791", +": c #3E3D70", +"< c #62618A", +"[ c #65658C", +"} c #64638A", +"| c #62628B", +"1 c #63638B", +"2 c #63628A", +"3 c #61608A", +"4 c #64648B", +"5 c #605F89", +"6 c #3E3D6F", +"7 c #FFFFFF", +"8 c #6D6D92", +"9 c #68678E", +"0 c #6B6A91", +"a c #696890", +"b c #6A698F", +"c c #68688F", +"d c #66658F", +"e c #6E6D95", +"f c #63628B", +"g c #B83243", +"h c #3D3C6F", +"i c #68678D", +"j c #6F6E93", +"k c #69688F", +"l c #6C6C92", +"m c #6B6A92", +"n c #6C6B91", +"o c #6D6C91", +"p c #696990", +"q c #6F6F93", +"r c #CF7681", +"s c #66658C", +"t c #6F6E94", +"u c #6A6990", +"v c #6E6D92", +"w c #6B6B8F", +"x c #6D6D91", +"y c #6D6C92", +"z c #6E6D94", +"A c #676690", +"B c #6F6E95", +"C c #65648D", +"D c #3C3B6E", +"E c #6A6991", +"F c #66658B", +"G c #66658E", +"H c #66668E", +"I c #67668E", +"J c #BD4352", +"K c #6C6C93", +"L c #6C6B90", +"M c #6A6A91", +"N c #68678F", +"O c #6F6E96", +"P c #64638C", +"Q c #CA6672", +"R c #65648B", +"S c #6C6C91", +"T c #6B6B91", +"U c #62628A", +"V c #66658D", +"W c #67668F", +"X c #64638D", +"Y c #6E6E95", +"Z c #C45462", +"` c #5E456E", +" . c #5F456E", +" ", +" ", +" ", +" ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". + @ # $ % & * = - ; > , ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". ) ! ~ { ] ^ / ] ~ ~ ~ ( _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". : < [ } | } 1 2 3 4 5 6 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". } 8 9 0 a b a c 0 d e f g g g g g g g g g g g g g g g g g g . ", +". h i j k l m n o p q 9 h r r r r r r r r r r r r r r r r r r . ", +". s t u v w x y k z A B C 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". D } E F 9 G H I [ 0 2 D J J J J J J J J J J J J J J J J J J . ", +". F B 9 K k L M N v H O P Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". D R z N S p b T G t C D 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". U t V m W u T W 8 X Y 3 Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". ` ` ` .` ` ` ` ` .` ` Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z Z . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q Q . ", +". J J J J J J J J J J J J J J J J J J J J J J J J J J J J J J . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". r r r r r r r r r r r r r r r r r r r r r r r r r r r r r r . ", +". g g g g g g g g g g g g g g g g g g g g g g g g g g g g g g . ", +". 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 . ", +". _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ . ", +". ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +" ", +" ", +" ", +" ", +" ", +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.png b/Source/Core/DolphinWX/resources/Flag_Unknown.png deleted file mode 100644 index 44cd41bafb..0000000000 Binary files a/Source/Core/DolphinWX/resources/Flag_Unknown.png and /dev/null differ diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 3d95beb102..d67ac42ee0 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,47 +1,91 @@ -/* XPM */ -static const char *const Flag_Unknown_xpm[] = { -"96 32 15 1", +/* XPM */ +static const char * Flag_Unknown_xpm[] = { +"96 32 59 1", " c None", -"! c black", -"# c #360000", -"$ c #D60000", -"% c #1B0000", -"& c #6B0000", -"' c #510000", -"( c #280000", -") c #BB0000", -"* c #780000", -"+ c #A00000", -", c #0D0000", -"- c #C90000", -". c #AE0000", -"0 c #430000", +". c #000000", +"+ c #FFFFFF", +"@ c #FF0000", +"# c #FE3434", +"$ c #FED4D4", +"% c #FE1C1C", +"& c #FE0303", +"* c #FE9292", +"= c #FEB3B3", +"- c #FEC2C2", +"; c #FE1010", +"> c #FE0D0D", +", c #FEB6B6", +"' c #FE3333", +") c #FEACAC", +"! c #FE0808", +"~ c #FE1E1E", +"{ c #FED2D2", +"] c #FEB8B8", +"^ c #FEB1B1", +"/ c #FE9494", +"( c #FE0202", +"_ c #FE3636", +": c #FEE7E7", +"< c #FE3D3D", +"[ c #FE3131", +"} c #FEB0B0", +"| c #FE0101", +"1 c #FEAFAF", +"2 c #FE9393", +"3 c #FE0606", +"4 c #FEAEAE", +"5 c #FE1F1F", +"6 c #FEE9E9", +"7 c #FEE8E8", +"8 c #FE2020", +"9 c #FE4747", +"0 c #FE2F2F", +"a c #FEA4A4", +"b c #FE0404", +"c c #FEA2A2", +"d c #FE7A7A", +"e c #FE6868", +"f c #FEEDED", +"g c #FE6767", +"h c #FE7C7C", +"i c #FECBCB", +"j c #FEB4B4", +"k c #FE0909", +"l c #FE9696", +"m c #FEFBFB", +"n c #FE8080", +"o c #FE2727", +"p c #FE8282", +"q c #FEFCFC", +"r c #FE5151", +"s c #FE0F0F", +"t c #FE8787", " ", " ", " ", " ", -" ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!####!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!#$$#!###! ", -"!!!%&'!!!!%&'!()$$$$$*!#$$##$$#! ", -"!!!#$+!!!!#$+,-$$$$$$$&#$$#))$#! ", -"!!!#$+!!!!#$+#$.!!!!0$+#$$)))#!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$))#!!! ", -"!!!#$+!!!!#$+#$+!!!!#$+#$$)))#!! ", -"!!!#$.!!!!0$+#$+!!!!#$+#))#))$#! ", -"!!!,-$$$$$$$&#$+!!!!#$+#$$!#$$#! ", -"!!!!()$$$$$*!%&'!!!!%&'!##!!##!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! ", -" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+@@++++@@++@@#+++@@++@@+++$%&*. ", +".+@@++++@@++@@@=++@@++@@++-;>,+. ", +".+@@++++@@++@@#'++@@++@@+)!~{++. ", +".+@@++++@@++@@]@^+@@++@@/(_:+++. ", +".+@@++++@@++@@+<[+@@++@@@@}++++. ", +".+@@++++@|++@@+-@1@@++@@2|34+++. ", +".+5@6++7@8++@@++90@@++@@+ab&c++. ", +".+d@effg@h++@@++i@@@++@@++jk|l+. ", +".+mno33opq++@@+++r@@++@@+++-s@t. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", " ", " ", " ",