From 14b8d3f107c697c900ca0f401f06fc360dca7b5b Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Wed, 9 Jan 2013 22:53:04 -0600 Subject: [PATCH 01/17] Add support for german region flag. Still need to change image. (currently using a copy of europe flag) --- Source/Core/DiscIO/Src/Volume.h | 1 + Source/Core/DiscIO/Src/VolumeCommon.cpp | 4 +- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 + .../Core/DolphinWX/resources/Flag_Germany.png | Bin 0 -> 795 bytes .../Core/DolphinWX/resources/Flag_Germany.xpm | 83 ++++++++++++++++++ 5 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.xpm diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index f8a6f13ecb..47cbc4f302 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -47,6 +47,7 @@ public: enum ECountry { COUNTRY_EUROPE = 0, + COUNTRY_GERMANY, COUNTRY_FRANCE, COUNTRY_RUSSIA, COUNTRY_USA, 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 28051eb390..f0811a9d27 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -36,6 +36,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" @@ -191,6 +192,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] = diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.png b/Source/Core/DolphinWX/resources/Flag_Germany.png new file mode 100644 index 0000000000000000000000000000000000000000..c41352f36a9f99809fdc50210496d29e2c11e479 GIT binary patch literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm new file mode 100644 index 0000000000..f0ca5a0934 --- /dev/null +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -0,0 +1,83 @@ +/* XPM */ +static const char *const Flag_Germany_xpm[] = { +"96 32 48 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", +" ", +" ", +" ", +" ", +" ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", +".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", +".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", +".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", +".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", +".''''''')!~''''''''')!~''''''''. ", +".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", +".///////(_://///////(_:////////. ", +".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", +".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", +".2222222223*4256723*42222222222. ", +".88888888890a8b*c890a8888888888. ", +".dddddddddddddefgdddddddddddddd. ", +".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +"................................ ", +" ", +" ", +" ", +" ", +" ", +" ", +" "}; From 6a13ae280d6093b9653c9b91ebed7151900df45e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 18:55:53 -0600 Subject: [PATCH 02/17] Updated flag images to not have ugly gradient. All images stolen from wikipedia. Added "SDK" flag to separate it from "Unknown" flag. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 7 +- .../Core/DolphinWX/resources/Flag_Europe.png | Bin 795 -> 419 bytes .../Core/DolphinWX/resources/Flag_Europe.xpm | 125 +++--- .../Core/DolphinWX/resources/Flag_France.png | Bin 466 -> 194 bytes .../Core/DolphinWX/resources/Flag_France.xpm | 84 ++-- .../Core/DolphinWX/resources/Flag_Germany.png | Bin 795 -> 191 bytes .../Core/DolphinWX/resources/Flag_Germany.xpm | 84 +--- .../Core/DolphinWX/resources/Flag_Italy.png | Bin 485 -> 194 bytes .../Core/DolphinWX/resources/Flag_Italy.xpm | 84 ++-- .../Core/DolphinWX/resources/Flag_Japan.png | Bin 908 -> 290 bytes .../Core/DolphinWX/resources/Flag_Japan.xpm | 114 ++---- .../Core/DolphinWX/resources/Flag_Korea.png | Bin 0 -> 730 bytes .../Core/DolphinWX/resources/Flag_Korea.xpm | 362 +++++++----------- .../Core/DolphinWX/resources/Flag_Taiwan.png | Bin 1081 -> 306 bytes .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 149 ++----- Source/Core/DolphinWX/resources/Flag_USA.png | Bin 726 -> 613 bytes Source/Core/DolphinWX/resources/Flag_USA.xpm | 152 +++++--- .../Core/DolphinWX/resources/Flag_Unknown.png | Bin 592 -> 485 bytes .../Core/DolphinWX/resources/Flag_Unknown.xpm | 118 ++++-- 19 files changed, 519 insertions(+), 760 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Korea.png diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index a9dfc2b7a1..8d9815e4cd 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -35,6 +35,8 @@ #include "WxUtils.h" #include "Main.h" +extern "C" +{ #include "../resources/Flag_Europe.xpm" #include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" @@ -44,6 +46,9 @@ #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" @@ -207,7 +212,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/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png index c41352f36a9f99809fdc50210496d29e2c11e479..a0e8c187e2050e0c826aa6ed03d41ef55299159c 100644 GIT binary patch delta 405 zcmbQuwwQT>L_G&H0|Ub?x!yD&#aZAHS$QFBEknz# z!pa;Yi=3hg-Qw~+;_^LX^L&%Ce3P=X>x(0b%R^e4JzAQ*dfHt3J6zY!HC#8_VBH*p ztqXLwEzsGvKzI8>ogE9ccP-M|wMcvSBF($oMIY=GdazUY|NsA$CWkeFj$kYa@(X5g zcyyw)lf>1jI1&ycu*Q@`*6U(YX~D;Ydp{an^LB{Ts5=VFna literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index def46811a6..1608b2cb78 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,54 +1,49 @@ /* XPM */ -static const char *const Flag_Europe_xpm[] = { -"96 32 48 1", +static char * Flag_Europe_xpm[] = { +"96 32 43 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 #043797", +"# c #013498", +"$ c #8F8845", +"% c #8C8645", +"& c #16408C", +"* c #DDB715", +"= c #415972", +"- c #848348", +"; c #84834A", +"> c #425A71", +", c #737754", +"' c #234884", +") c #4D626A", +"! c #B6A02D", +"~ c #0C3B92", +"{ c #B7A12C", +"] c #465E6F", +"^ c #AE9B30", +"/ c #AE9C30", +"( c #3A5676", +"_ c #BBA229", +": c #16418C", +"< c #BAA22A", +"[ c #395577", +"} c #2B4D7F", +"| c #B8A12B", +"1 c #BAA22B", +"2 c #2A4D7F", +"3 c #4D626B", +"4 c #B5A02D", +"5 c #B6A02C", +"6 c #AD9D31", +"7 c #103D8F", +"8 c #6B7358", +"9 c #1B4489", +"0 c #063795", +"a c #E0B912", +"b c #485E6F", +"c c #495D6E", +"d c #E0B913", " ", " ", " ", @@ -56,23 +51,23 @@ static const char *const Flag_Europe_xpm[] = { " ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@+#$%#+@+++++++++++. ", +".++++++++++&*=+-;+>*&++++++++++. ", +".+++++++++++,'++++',+++++++++++. ", +".++++++++)!~++++++++~{)++++++++. ", +".++++++++]^++++++++++/]++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+++++++(_:++++++++++:<[+++++++. ", +".+++++++}|++++++++++++12+++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++34~++++++++~53++++++++. ", +".++++++++]/++++++++++6]++++++++. ", +".++++++++++789++++987++++++++++. ", +".++++++++++0ab#$%#cd0++++++++++. ", +".++++++++++++++-;++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png index 3390ee79c2d9475a6ce222c217c410767de59668..6aed09aab155f98c106277d1a264671d077a3b66 100644 GIT binary patch delta 178 zcmcb_e28&^L_G^L0|SHnyM%Ng#aZAHS`*1afpd zT^vI!PA4ZwbUFy|3S3cG!os4Zr|s|{hlizYv6P!>Pu7B^Y?C&>&{)9Az~C8eDJ#_4 RmIBns;OXk;vd$@?2>|VHFyR0I literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)Y1Tubmx;TbZ+epj|R+ekhCaFap&xG_*&o>o-i3Kk?-9hBJ0dXFmS>x9Cg)&-xY9 zTnl#=om6fSh}+E1Fr$;0Ksd7KX{N)A6? zd4}`DL$L#e8rK=*)f#HA^9nP(JHT>bR$j&Zsg{g(ciu6q)huSJnZdBl*ZhnuLwN$z zics@Cxu@oUln0d@-l_$bExN`#eG$;8L?#bU^EsQ1)DN_CD!AP(@B%5!t8YFgvDirC z0P}j6xaE!C4}<&w0{>qy_brcj&$1W23hFo>gTe~DWM4fT$-mU diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 51cde44d8c..6336122380 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,75 +1,35 @@ /* XPM */ -static const char *const Flag_France_xpm[] = { -"96 32 45 1", +static 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.png b/Source/Core/DolphinWX/resources/Flag_Germany.png index c41352f36a9f99809fdc50210496d29e2c11e479..f803d4ed133d25f34d6cc4c857ca618d656d6af0 100644 GIT binary patch delta 175 zcmbQuwx4l=L_G^L0|SHnyM%Ng#aZAHSDM|2c;L|Nl!!&T0qp8B2ovf*Bm1-ADs*lDyqrSo$+=1_C*n zo-U3d7N?UFBsv`gczd!Ibg?O_ifAmbSj8wUVCKfywpeP#q#tgKx(p0fk?Q&u5{=t| Px)?lN{an^LB{Ts5#;Gme literal 795 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)&@pN$vskrs__FgY-M-lc9i{l<{iQ18% z`0_}a)KPH(L8h{ooA?E0>!y3}|J7=;QOL!2X{#%Twq^}GxBP)qy4UzcOgql#s;QK( zN|}6?=g!~%vz%|7IeF6H@VT1;NZD7#i_$xs#<|LM$``}bY;z5hLZy34%hm7b5Pq!v6V;a_m&$;6pIUwdob z|Ngg|d#TO&&-3Q7U0*uo(*uWr!ty$ z-+cqL?5(f)*7WpUD{E_H?B}2T!(jW1@57%twqBa460_33&7J%4^UX8;$^sJmnfL5T z@fSE=xM!PNh}KjuZ*P~iVXL=pG_13`{d3`s9=Qkq?g7o`yf~lj3j=HF9Y#AlHUAT5 z?z|NW)tY+hu594)%P({Cgj78z>FD{@+c=213IF+LSIN_)U}3Ae>iX-iinZ_oDLywYc6cb+5R4r5%ry1xX_>P?Hzzv1Tob!Oi#s}u4pjs>NzB5jEk zwQKM1-{%(sbWRYTJpTms#q1WAGyk!3DIPh@90(MhJO4H7zP-Lz^0wcOjxO8(=U!aB z)CFddDH|F2_+zIhU;kHEFSUV@>y!mkZQU+C_5*rIZu>pQPpZcrA0#4L#X)BlfY zf#r|f3zy<20=cRst`Q|Ei6yC4$wjF^iowXhz*5)19Ed`UjIE5#tPG5_4UDY}47Ofr fVMo!Bo1c=IR*74~kxrZ4AR9eh{an^LB{Ts5tnE;^ diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index f0ca5a0934..4e4c69324d 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,78 +1,34 @@ /* XPM */ -static const char *const Flag_Germany_xpm[] = { -"96 32 48 1", +static char * Flag_Germany_xpm[] = { +"96 32 4 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 #DD0000", +"@ c #FFCE00", " ", " ", " ", " ", " ", "................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +"................................ ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", -".@@@@@@@@@@@@@#$%@@@@@@@@@@@@@@. ", -".@@@@@@@@@#$%@&*=@#$%@@@@@@@@@@. ", -".@@@@@@@@@&*=@-;>@&*=@@@@@@@@@@. ", -".@@@@@@@@@-;>@@@@@-;>@@@@@@@@@@. ", -".,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,. ", -".''''''')!~''''''''')!~''''''''. ", -".{{{{{{{]*^{{{{{{{{{]*^{{{{{{{{. ", -".///////(_://///////(_:////////. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[}|1[[[[[}|1[[[[[[[[[[. ", -".2222222223*4256723*42222222222. ", -".88888888890a8b*c890a8888888888. ", -".dddddddddddddefgdddddddddddddd. ", -".hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", -".iiiiiiiiiiiiiiiiiiiiiiiiiiiiii. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png index aa0ea79d31a21ecdbcfe4ec81adcf2b3385423b4..2b2a8ef1e2629d3bd8a34859c9497c3261a6505b 100644 GIT binary patch delta 178 zcmaFLe28&^L_G^L0|SHnyM%Ng#aZAHSCd7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+A^K@|xskrs_wr^gufrx8jaOwV=US?S* zH~kSmE+(52&@U1DYgWNN&YpQWM+BXio&)tVFzo1fTY97Xb*n^t+u17C4IlqjSMAnh zfB*Y$onP4PWjkVbK7BZ+IQ|+pgN`7BUN1vI=4tB#bFOtW{<|e~K;qQF;&YxsKi*Gc zs0!zkOXkT9YPgrl_~qX2GNlFESprrU88AMO)nVMSOeQ9K?X4vYdoRypSi5zZFV}@= zCJk518R`u84hlJ(J9TjBlto}c4^K;r=X17tGFEvroL^p4;H8;4nd!?k208wx4=|^*m!v#E0#T`o`^V1=_7np{%_4ahpMvf^>)vYt zMN~^%BT7;dOH!?pi&B9UgOP!OrLKXou90zwk+GGjk(H65wtIB*8>FVdQ&MBb@096dG-v9sr diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index c47c87791a..f81cc4bc94 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,75 +1,35 @@ /* XPM */ -static const char *const Flag_Italy_xpm[] = { -"96 32 45 1", +static 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 index 183275cd85f020f62fd116a33531ba366989d7e3..d68affd97241ffb1dcb2316fcbdc42a7a4646999 100644 GIT binary patch delta 275 zcmeBSU&J&)qMn19fq~(cTyGkX;wKvpv*dAqv^Rqx3G8Jgtj;uzv_ zJUKyv^{~8w5W|#cg%FVdQ&MBb@00(7b+5i9m literal 908 zcmeAS@N?(olHy`uVBq!ia0vp^2|%nMzy>7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+0>gnPbQgQ3;?TvYl90b@N+`r)|7_f*% zqk&24g@W&^j!8nbb!GN4~=t5sTVp~V%St)@MuWf`qnxnNG@1fqia#Y?O=@;EFDcp z*cL2aR>}X-Fo=(>nNcBi`|Y<(2QFW}EX;7^@kfgV8b^~haxg3nT6sj7t5&m;Vb{9X zL0*;R<>lMw>f3FKi;s`@)_j^`G*d=t{ol;zGnUEy;?`^xaN@8JyKLgC*{UJJ)mne^ zhy8jdm&F%XOmXsAetG5mpO&w`6|=`ya!spd*`#xNlg@j_(5*Lf%osyud)*eFKOQI& zd%e`5BWr6EYtHV=FH4&A#B0sp)iyjW+8Lv_x20&^z2(bi`lxNbeIPD({l)zJ#~&+r z82oD1D^2uJ5h^@=AoH=u&mX)We*E~sv1kA9%^&MkTZ~#XZNAC#;jzTm+b&yw*4VL!T#cUR^1CLRL391Ob?X=oUoi1yX1KjA_rDNtyKtuq z(*+YVhM&iC8@^WUja$E$-K6LC?c31_n_qsdvVH$C#1!bH#>tao^rkcGoStvf*|3)_ zVr|&!tEZ|D1gr>J8Pf3ldENf|>`U(Cn9V+a+`Z$;0 zci0Sg4jc3|?`d6@dEjX(FihWHv%krAuKjd-2GDmm&+JqZmKEO4Sn}7vd_%{-^grH9 zg4yi299`hx{zd*Cxs4mcptHiD0NT 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 #FEFDFD", +"# c #F1C9D3", +"$ c #E9AAB9", +"% c #E69FB0", +"& c #C41F47", +"* c #BC002D", +"= c #C42047", +"- c #E6A1B2", +"; c #DA748D", +"> c #DB758D", +", c #EBB4C1", +"' c #ECB6C3", +") c #CD4263", +"! c #CE4465", +"~ c #BF0D38", +"{ c #C00E39", " ", " ", " ", @@ -77,21 +29,21 @@ 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.png b/Source/Core/DolphinWX/resources/Flag_Korea.png new file mode 100644 index 0000000000000000000000000000000000000000..ff63df146c74a0ee226eabe014f6a661c668c5bc GIT binary patch literal 730 zcmV<00ww*4P)*J zGIS9!avL*p9W!z)EG#cCFEB7LG&D3dH8nOiHa9mnIXO8xIyyW&JU%`?KR-W0K6OGu zLPJACMMXtNM@L9VNKsKyQc_Y@C|*`pR#zfeTq0IoU0q*aUtwWkWMpJ#XJ=_?X=-X} zYaUT-Ms;j#Y;JCDaBy&OadC4UPIYy4dSr}yWsQF%Q-6PdhlhuVh=_`cij0hml$4Z~ zmX?^9n4O)SqobpyrlzcwudSA`uMs)3QF62pH@3F6x3{;ty1Kikyt})*!>_}}3^2$R zImjD6$rn1ww#mxM%FZlI(!kEw*VouubJ*C}+9?6?CkHl#qaO$ z@V&?J#m({5+w#iN^Yiod)!X*=_WAkw`uO_#`uh9(`~3X;{`>s?{Qdv`|F>lRtpET3 z0d!JMQvg8b*k%9#00Cl4M?`8RVwDa6009z7L_t(Y$75g^1;ZaO5&)E2kcAge&w@}? zgF~rpfvcc#IKudFV*z*SS`fjduFRhbGe4P6SzSAtniiys=?h7?WMySUg@naqW@Wjk z3Y&;H68gmaU4Jg$$L8 z3N1wuL{TBGq@@;3-AMKmu}nauodhdkzoAxK)3Cy!b(J{^M#10*04nFV=^PKAP5=M^ M07*qoM6N<$g3yyYY5)KL literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 7b51bc78ef..857f82e721 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,242 +1,137 @@ /* 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 char * Flag_Korea_xpm[] = { +"96 32 107 2", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #E4E4E4", +"# c #BABABA", +"$ c #3A3A3A", +"% c #7F7F7F", +"& c #E8E8E8", +"* c #393939", +"= c #BBBBBB", +"- c #EBEBEB", +"; c #2F2F2F", +"> c #6A6A6A", +", c #616161", +"' c #373737", +") c #FAFAFA", +"! c #F9F9F9", +"~ c #363636", +"{ c #6E6E6E", +"] c #EFEFEF", +"^ c #FCFCFC", +"/ c #424242", +"( c #757575", +"_ c #3C3C3C", +": c #454545", +"< c #B7B7B7", +"[ c #FEFBFC", +"} c #EFBAC5", +"| c #E48E9E", +"1 c #E58F9F", +"2 c #F0BDC7", +"3 c #FEFCFD", +"4 c #676767", +"5 c #3E3E3E", +"6 c #878787", +"7 c #D7D7D7", +"8 c #707070", +"9 c #2C2C2C", +"0 c #717171", +"a c #F1C5CD", +"b c #CE2C4C", +"c c #C60C30", +"d c #F2CAD2", +"e c #9D9D9D", +"f c #D8D8D8", +"g c #F6F6F6", +"h c #B6B6B6", +"i c #474747", +"j c #FBFBFB", +"k c #F1D4DB", +"l c #C81639", +"m c #C9173A", +"n c #F5D5DB", +"o c #484848", +"p c #B35172", +"q c #D85A73", +"r c #56285E", +"s c #731D4E", +"t c #113172", +"u c #0B3274", +"v c #5C2256", +"w c #C81B3E", +"x c #0C3274", +"y c #6B1E51", +"z c #B41037", +"A c #AF1139", +"B c #572258", +"C c #003478", +"D c #7F2453", +"E c #423E75", +"F c #6C4675", +"G c #ECECEC", +"H c #A3A3A3", +"I c #343434", +"J c #C9B6C9", +"K c #093375", +"L c #D2C0CE", +"M c #353535", +"N c #6C6C6C", +"O c #303030", +"P c #BBA7BC", +"Q c #1B3372", +"R c #1D3372", +"S c #C3AFC3", +"T c #515151", +"U c #888888", +"V c #8C8C8C", +"W c #565656", +"X c #A6A6A6", +"Y c #FAF8FA", +"Z c #AD96B1", +"` c #7B658D", +" . c #7A648C", +".. c #AC95AF", +"+. c #646464", +"@. c #8A8A8A", +"#. c #949494", +"$. c #525252", +"%. c #5D5D5D", +"&. c #3F3F3F", +"*. c #434343", +"=. c #5F5F5F", +"-. c #696969", +";. c #CACACA", +">. c #969696", +",. c #F3F3F3", +"'. c #989898", " ", " ", " ", " ", " ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -". 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 8 0 + + a b c c c c b d + + e 8 9 8 f + + + + . ", +". + + + + + g h i j + k l c c c c c c m n + j o h g + + + + + . ", +". + + + + + + + ^ + + p c c c c c c c c q + + ^ + + + + + + + . ", +". + + + + + + + + + + r c c c c s t u v w + + + + + + + + + + . ", +". + + + + + + + + + + x y z A B C C C C D + + + + + + + + + + . ", +". + + + + + + + ^ + + E C C C C C C C C F + + ^ + + + + + + + . ", +". + + + + + G H I g + J K C C C C C C u L + g M H G + + + + + . ", +". + + + + 7 N O 8 0 + + P Q C C C C R S + + e 0 O N f + + + + . ", +". + + + + + T U V W X + + Y Z ` ...Y + + X +.@.#.$.+ + + + + . ", +". + + + + + - ; N %.&.) + + + + + + + + ! *.=.N -.] + + + + + . ", +". + + + + + + ;.&.>.,.+ + + + + + + + + + ,.'.5 ;.+ + + + + + . ", +". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", +". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", " ", " ", @@ -244,5 +139,4 @@ static const char *const Flag_Korea_xpm[] = { " ", " ", " ", -" " -}; +" "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png index c71920f92c5342c4aa9d05b48bcf7541fdddfb1a..d5bb1007f1cb3a62785204cf902e9c0d5b7d91fe 100644 GIT binary patch delta 291 zcmdnVv59GdL_G&H0|Ub?x!yD&#aZAHSShL1=7+BR8*GO+OCU?+|}22zOV0MfB%L4 z{)-bPT%0!T^0aAJrcb|e^XB_ox8DC_VEAAE|Nk?djn+Vu7)yfuf*Bm1-2l0SG0EHA zMV$NEjD8>|+0(@_#N+tetKNJK3OufXEL{p(KNkPKzcN|PYQpptFK-^;&6J)Z^#A(Z z3b_kggR(^n(hT?{6zuhPs>dj-VSgXpz?yUB%$&u4-*B7!Ec7}dd0;z775mdkEGi0( hGHQ%prfVMgJ(n{@P4s2?)?*+)dAj7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME)U@^o(Z>H&oTKU6Rf#d;InF zJ2q8Li@wJ<%v=IRmVV@9I`On<=k4u^98C&cbvAaU*iw6JLo;P!<>hF@3 z_V<`qNJ@uXk6JMMl!9)}=k2fgcn{7t&%a;yFDGiY8*>^^o4ebC!|mVSpHBVocjCl{ ziNMmNoKj*Gvx{%*`E&sW4{jzoUm^=Qg z6k(9e;A-I6vTrZDfFK-9{QpKjd3s*ZmQdeBV75~&ag8WRNi0dVN-jzTQVd2029~-8 z=0Fr;WNc+@W@TWcZD4F=V6gQ{3pj&$1W25MmNboFyt=akR{01p4| AVE_OC diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index f0670e4bc4..3f092d6149 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,119 +1,54 @@ /* XPM */ -static const char *const Flag_Taiwan_xpm[] = { -"96 32 89 1", +static char * Flag_Taiwan_xpm[] = { +"96 32 24 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 #12129C", +"$ c #010195", +"% c #3D3DAE", +"& c #0B0B9A", +"* c #1B1BA0", +"= c #8F8FD0", +"- c #9696D3", +"; c #9090D1", +"> c #1A1AA0", +", c #2424A4", +"' c #9696D4", +") c #DADAEF", +"! c #FFFFFF", +"~ c #D9D9EF", +"{ c #9797D4", +"] c #040497", +"^ c #5959BA", +"/ c #8E8ECF", +"( c #8E8ED1", +"_ c #8F8FD1", " ", " ", " ", " ", " ", "................................ ", -".#####$%#&'$$$##()*+***********. ", -".###$$,-!0&1!$##()*+***********. ", -".##$#23456789:$#()*+***********. ", -".###2;<=>?@ABCD#()*+***********. ", -".###$CEFGGGHI&D$()*+***********. ", -".##D-JKLMNOPQR-S()*+***********. ", -".###$TUGGNGVWX$#()*+***********. ", -".###2YZ[]^P_`aD$()*+***********. ", -".###$bcdEefg3D$#()*+***********. ", -".hhhhhijiklm#hhhno*p***********. ", -".qqqqqqrsrqrqqqqtu*v***********. ", -".wwwwwwxwywxwwwwwz*{***********. ", -".******************************. ", -".{{{{{{{{{{{{{{{{{*{***********. ", -".******************************. ", -".******************************. ", -".******************************. ", -".******************************. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".++++&*=-;>&++++@@@@@@@@@@@@@@@. ", +".++++,')!~{,++++@@@@@@@@@@@@@@@. ", +".+++]^;!!!;^]+++@@@@@@@@@@@@@@@. ", +".++++,')!~{,++++@@@@@@@@@@@@@@@. ", +".++++&*/(_>&++++@@@@@@@@@@@@@@@. ", +".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".+++++++++++++++@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png index 2803a73a3d3a067360eac6e661d7723d6e24b7f1..e34f11c274a62a83baefc7c412f694efc8a759ee 100644 GIT binary patch delta 600 zcmcb{`jlmYL_G&H0|Ub?x!yD&#aZAHS`F@PNJ{ESPU=if>P}ATNlETX zN$yTb1~Ph6Q@T=9x>HknQd5BJzSPvdwAAjj)Sk4|-ZUUP4T$>F(|Xg>`qDv+3F+y5 z>FNFH=@T;2do$AeGSd4qfb5L^j0_+-F*Bn-Gh;$#W`CAfePLE+Ulx#+IUy@^Vpdjv zR@TJqtO?m5a#BwAq}-f|xjB>aa)D^dCMA;{M$V_wif+$b_;A(6w`VSVzWd<+|Nqz5 z#I*r~g0UpXFPOpM*$q%oGA4PuyM)(r-IND%u6epRhIkx*d)1wNj7FP@UZDcy@{dbn;IrHq- TIjAoN`jNrY)z4*}Q$iB}r7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME+Y@9E+gQgQ3;ZNuzC4kGLyriWR%_#QZ^ zKjB?zfvEWNb$94!lN}0o+)ui9?@SQuMi;WBC|<`W%rVp_6M0(+rGxV z{9Avzu>1SH!{z!~LX1EgfI#Aqm$>Fm=0v^bqq2-2PRz|O*>*7L;qSF#@sFl@ZNL5Y z(_H>~uV2@u2c7y@VOCwc_s+i^T#79Mlg?J&OIUYC`NHw`ea+KP`#pczsWD$)gp2iW z=ly%X_Pt+i^g!@LK=||7hZ{BaZq(myzb?ovP(<+P$Ev+?uj3gz_W3ki^}2u1i6c-; z(6aBb1)uYyX{mGH)%q|5r`oZ&2UaDYf9~@A``4zcdTjAb zk9mfdZ-W8PVS^`p?(*k9+nf(hJ-}ixWfsHk*!}n47q>Gnn4Z;OaWBVA`dtCTmmuDP z;>$T^v+q27VItM*cE^yx{3?SJPy1oTatns4m24ID_w%+#LsV|KZ!Xo#R&HU%>L^ff zoZ(Igb4o=IEOiacfhfet*vi<<%D_n5z}U*bVC$6@b`%Y{`6-!cmAEw=>9pAmveDDk&t;uc GLK6U!ur6Hy diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 0a991bd02e..eca9509e16 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,60 +1,118 @@ /* XPM */ -static const char * Flag_USA_xpm[] = { -"96 32 30 1", +static char * Flag_USA_xpm[] = { +"96 32 88 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", +"+ c #545380", +"@ c #5C5B87", +"# c #565580", +"$ c #5B5A85", +"% c #585782", +"& c #5B5A84", +"* c #5A5984", +"= c #585783", +"- c #5C5B85", +"; c #555481", +"> c #5D5C85", +", c #54537F", +"' c #B22234", +") c #494878", +"! c #64638A", +"~ c #686891", +"{ c #66658B", +"] c #66668F", +"^ c #67668D", +"/ c #65658E", +"( c #68678E", +"_ c #65648D", +": c #6A6A8F", +"< c #62628C", +"[ c #4A4A78", +"} c #E1AAB1", +"| c #5B5A83", +"1 c #6B6A92", +"2 c #68678D", +"3 c #6A698E", +"4 c #696890", +"5 c #6A6990", +"6 c #676790", +"7 c #6D6C91", +"8 c #68678F", +"9 c #6C6B92", +"0 c #595883", +"a c #EDCCD0", +"b c #484777", +"c c #66668E", +"d c #69688F", +"e c #6B6A91", +"f c #6A6991", +"g c #6A6A91", +"h c #686790", +"i c #6E6D92", +"j c #67678E", +"k c #494877", +"l c #585784", +"m c #69698F", +"n c #61618A", +"o c #676690", +"p c #65648B", +"q c #65648E", +"r c #66658D", +"s c #64638D", +"t c #605F8A", +"u c #68688F", +"v c #F3DDE0", +"w c #434273", +"x c #64638B", +"y c #686890", +"z c #66658E", +"A c #63628C", +"B c #DB99A1", +"C c #6A698F", +"D c #626188", +"E c #67668E", +"F c #636289", +"G c #66658C", +"H c #63628B", +"I c #606089", +"J c #B83243", +"K c #414071", +"L c #65648A", +"M c #67668F", +"N c #6B6A90", +"O c #6E6D94", +"P c #64638C", +"Q c #FFFFFF", +"R c #5D5C86", +"S c #6D6C92", +"T c #65648C", +"U c #67678F", +"V c #CA6672", +"W c #6A4A71", " ", " ", " ", " ", " ", "................................ ", -".++++++++++++++@@@@@@@@@@@@@@@@. ", -".+#+#+#+#+#+#++$%%%%%%%%%%%%%%%. ", -".&&&&&&&&&&&&&&*===============. ", -".-;-;-;-;-;-;--@@@@@@@@@@@@@@@@. ", -".>>>>>>>>>>>>>>$%%%%%%%%%%%%%%%. ", -".,',',',',',',,*))))))))))))))). ", -".!!!!!!!!!!!!!!@~~~~~~~~~~~~~~~. ", -".{]{]{]{]{]{]{{$$$$$$$$$$$$$$$$. ", -".^^^^^^^^^^^^^^****************. ", -".^^^^^^^^^^^^^^@///////////////. ", -".((((((((((((((((((((((((((((((. ", -".______________________________. ", -".::::::::::::::::::::::::::::::. ", -".<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<. ", -".[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[. ", +".+@#$%&*=-;>,''''''''''''''''''. ", +".)!~{]^/(_:<[}}}}}}}}}}}}}}}}}}. ", +".|12134567890aaaaaaaaaaaaaaaaaa. ", +".bc9d1efghijk''''''''''''''''''. ", +".lmnopqrs2tu0vvvvvvvvvvvvvvvvvv. ", +".wx9^5y8fziAwBBBBBBBBBBBBBBBBBB. ", +".$CDEFGqH2IC&JJJJJJJJJJJJJJJJJJ. ", +".KLiMeudNrOPKQQQQQQQQQQQQQQQQQQ. ", +".RST4_U4qNASRVVVVVVVVVVVVVVVVVV. ", +".WWWWWWWWWWWWVVVVVVVVVVVVVVVVVV. ", +".QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ. ", +".JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ. ", +".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", +".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv. ", +".''''''''''''''''''''''''''''''. ", +".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa. ", ".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".||||||||||||||||||||||||||||||. ", -".111111111111111111111111111111. ", +".''''''''''''''''''''''''''''''. ", "................................ ", " ", " ", diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.png b/Source/Core/DolphinWX/resources/Flag_Unknown.png index 44cd41bafb29d62d7314058124968daa29e61164..73e2651bd2a079ab6a2a50690698a20f58b329ac 100644 GIT binary patch delta 471 zcmV;|0Vw{^1my#e7=H)@0002m9*t%I000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2i*Y+0520Bw{lYe006O2OjJbx000000R901{sIF20|Wj91pWpF{s;*E2?_oU4gL=g z{tyuU931{09{wL6{vaU!Cnx?dFa9wx{xdWFG&KG;HvT<5{(nbD{!vl>XJ`IsX#RS7 z{(OA?fPnsjg8qkx{*sdZlav0Gl>U~M{-UD(q@@0=tp2X9{;#k8u(1BIvHr8O{#h$($fCa)c)t^{^;ob>FNIM?f(1w{`~y^00960{}Eq~%K!iX0d!JM zQvg8b*k%9#0Dl2uOGiXHP6@>N00023NklN%o zAVUTL3#Fp2qs_Wz&7EOr{-4+zJ{RyMTJRGAK#~9nRKtqoDQ6C)1=u_VPBy)hPf!U3 z^JM-g-=aO%el?EQ&R>`T>*b(XSP2hVkpLYmJ;6v>3s50J0ax;ZqL-pk^0Ukm=2S+| zLECj(=z4+!f-Tyn)I>yZ>)DoN_wWApH^Vz{G8pKmLJOksWok6h=K(dWa7u1}qc@Qfx`y?k@kqfHUIz9iRwjfk$L9 zkoEv$x0Bg+Ai=T%$8;c_0K^Im9gC)YWME*d^mK6yskrs_*2cAm3NkBZa&1v>Gq6*+R^ zs$85+I>jmut5pjvrc~_oxRZC+{7dZhJntC2v)}Ay_Z~T_v}UhgO?;C=ZfiBe+!>QQ zj~rBZ)8=~JR7&W2_U70X7fYaDjS^F)2R$FEJ zy}0Dj?JsA~Ut+JkxXR&rcEs-6Z?`@_lO{Ct#}Dq*0F||$I2U*;#orXkIb`(WqekHM2T}WMWd40`_`C0pd_wr-lC|qQ6Q(;h+Pptr z@P5_p>0kFZ{dL=JzI)&2{f7@6FX()f9U#djq!2juJ`1y+3d1BfCWTBe1qvw;2#DpM zpb;8S>-%Cdkf&PW8c~vxSdwa$T$Bo=7>o=IEOiacfhfet*vi<<%D_n5z}U*bVC$6@ eb`%Y{`6-!cmAEw=>9pAmve47j&t;ucLK6VNQs>10 diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 3d95beb102..5c8c19968d 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,46 +1,90 @@ -/* XPM */ -static const char *const Flag_Unknown_xpm[] = { -"96 32 15 1", +/* XPM */ +static 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. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +"................................ ", " ", " ", " ", From a167bccb035e38c593472d4490a7e369af6d04c7 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 18:59:15 -0600 Subject: [PATCH 03/17] Apparently the order here was important, cached somewhere I guess. --- Source/Core/DiscIO/Src/Volume.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DiscIO/Src/Volume.h b/Source/Core/DiscIO/Src/Volume.h index 47cbc4f302..c90ee4a381 100644 --- a/Source/Core/DiscIO/Src/Volume.h +++ b/Source/Core/DiscIO/Src/Volume.h @@ -47,7 +47,6 @@ public: enum ECountry { COUNTRY_EUROPE = 0, - COUNTRY_GERMANY, COUNTRY_FRANCE, COUNTRY_RUSSIA, COUNTRY_USA, @@ -57,6 +56,7 @@ public: COUNTRY_TAIWAN, COUNTRY_SDK, COUNTRY_UNKNOWN, + COUNTRY_GERMANY, NUMBER_OF_COUNTRIES }; From 561b09457c7a1f34a8183e3464b6a1def3fa8ccc Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:01:58 -0600 Subject: [PATCH 04/17] Fix warnings. Forgot to add Sdk flags. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 3 - .../Core/DolphinWX/resources/Flag_Europe.xpm | 2 +- .../Core/DolphinWX/resources/Flag_France.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Germany.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Italy.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Japan.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Korea.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_Sdk.png | Bin 0 -> 588 bytes Source/Core/DolphinWX/resources/Flag_Sdk.xpm | 114 ++++++++++++++++++ .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 2 +- Source/Core/DolphinWX/resources/Flag_USA.xpm | 2 +- .../Core/DolphinWX/resources/Flag_Unknown.xpm | 2 +- 12 files changed, 123 insertions(+), 12 deletions(-) create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.png create mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.xpm diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 8d9815e4cd..1b35e06c29 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -35,8 +35,6 @@ #include "WxUtils.h" #include "Main.h" -extern "C" -{ #include "../resources/Flag_Europe.xpm" #include "../resources/Flag_Germany.xpm" #include "../resources/Flag_France.xpm" @@ -47,7 +45,6 @@ extern "C" #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" diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index 1608b2cb78..ea966ec317 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Europe_xpm[] = { +static const char * Flag_Europe_xpm[] = { "96 32 43 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index 6336122380..f53abf6822 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_France_xpm[] = { +static const char * Flag_France_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index 4e4c69324d..cd925bd2c8 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Germany_xpm[] = { +static const char * Flag_Germany_xpm[] = { "96 32 4 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index f81cc4bc94..78d39a848c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Italy_xpm[] = { +static const char * Flag_Italy_xpm[] = { "96 32 5 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index 556dd9fa36..baf2c5982c 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Japan_xpm[] = { +static const char * Flag_Japan_xpm[] = { "96 32 19 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 857f82e721..32ce1a5289 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Korea_xpm[] = { +static const char * Flag_Korea_xpm[] = { "96 32 107 2", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.png b/Source/Core/DolphinWX/resources/Flag_Sdk.png new file mode 100644 index 0000000000000000000000000000000000000000..803aab2b9a17a1bc2a6d29a05f2407572a26319d GIT binary patch literal 588 zcmW-eZAg;=6oub+n{IASrA=GYEgQ4QF&HKa%GRtcx2DT2G5irTNo9X3+O#N$CgxfY zgqleVDlr>m!-;HBSTHOHjtVjSz?BH|t6X0{oFwP%T^G)MxaZ$F*HdS%=5xhdf*|-t zgU(8`iB=(pN$*AJ-BubImkf;#g5U{KB8i7y5pA-a##%i)M)C+{#f2lcCunP{uBKj3 z^Z!sJ2?hg9CRi+_r6D~XY&JL?WMqKLMP?@Wd}L)II~zGU5D1W)3$Yma`6wuWL;|T4 zg@usGAeTd-fKrK)5|oueqd{#gEEY60ps^7)8`|1nx1+rs9UXAF;C92~K~E2Qd(qd2 z{(gA97#zgV5PUw2jKJ^5=qLgKjE^H2L@0!C7?YETMlmyk*;&M5SXn_lj@4DHtzmr~ z8ync%L?VIhZ6uS}*}?8ED2ke5@BF0Gl1{7nG@)IcPqjrho2qpr#ZZ2sk9ni6s@^cQ zbzd(CtAt(W?1vkcVzDPL_l79S@tCo+tnJ=VEgWw>^|$E9guFuXnKDsTUzz@kdh#gw zeN6g6^43je?pI3AU$N!g2%ccwd%s+2QUsb~c?*i0o@tHD!8oLQTJZbL^T@P$l(p7% zQrJ~Fx2PdZSBvJF_T*dDqU+>9W$`k{d|CTwNqBZRp0oQ=kd&V(AGju;a;81t`h4nj z(L&h)?bvHIFA@oSn-lV1bRXQOEsi=|;i@|=lEBIzX^q$S=~*YE^jC}3Vz-sQdv!~s S8thG^er?p7b^c>bo&Nv@3KIGN literal 0 HcmV?d00001 diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm new file mode 100644 index 0000000000..0df81bf81f --- /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.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index 3f092d6149..da0f13de47 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Taiwan_xpm[] = { +static const char * Flag_Taiwan_xpm[] = { "96 32 24 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index eca9509e16..44260eca52 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_USA_xpm[] = { +static const char * Flag_USA_xpm[] = { "96 32 88 1", " c None", ". c #000000", diff --git a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 5c8c19968d..381d43f304 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * Flag_Unknown_xpm[] = { +static const char * Flag_Unknown_xpm[] = { "96 32 59 1", " c None", ". c #000000", From 34a82738017ba05bb05561c687ad69f06e821ce5 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:11:03 -0600 Subject: [PATCH 05/17] we don't need PNGs of the flags --- Source/Core/DolphinWX/resources/Flag_Europe.png | Bin 419 -> 0 bytes Source/Core/DolphinWX/resources/Flag_France.png | Bin 194 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Germany.png | Bin 191 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Italy.png | Bin 194 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Japan.png | Bin 290 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Korea.png | Bin 730 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Sdk.png | Bin 588 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Taiwan.png | Bin 306 -> 0 bytes Source/Core/DolphinWX/resources/Flag_USA.png | Bin 613 -> 0 bytes Source/Core/DolphinWX/resources/Flag_Unknown.png | Bin 485 -> 0 bytes 10 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Source/Core/DolphinWX/resources/Flag_Europe.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_France.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Germany.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Italy.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Japan.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Korea.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Sdk.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Taiwan.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_USA.png delete mode 100644 Source/Core/DolphinWX/resources/Flag_Unknown.png diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.png b/Source/Core/DolphinWX/resources/Flag_Europe.png deleted file mode 100644 index a0e8c187e2050e0c826aa6ed03d41ef55299159c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(LD77V`EDMdP)mSMh%1l=0pppBCNo&fr?Z()<*}Y5VB0U|&?Dy9Bkj_u z?9rm-Td(a~Zy8!{6;|dLS>zN|=oXjn5tr{7o9CO9<(rh9T^vzd9@5h6(bDYI)8^XW z;ktIN;kwxd>*g42U7)*dfzGxCy4x4(>{zJ1YmwHjMcTU;Y2Mu~`e3KfgPp?v|NpNv zIjjkE17k^$UoeBivl}2!FeZ7syJ)NIe8K_b%6NG4OSvmTC&;clX3SzdYX*~&sAktiCDD`0cXYjHhaAy6$GT|8k(-%Q zCP$jKI;KwS5Yy)M4o-+PnbMtoE5hNmRFVdQ&MBb@ E0I$!HfB*mh diff --git a/Source/Core/DolphinWX/resources/Flag_France.png b/Source/Core/DolphinWX/resources/Flag_France.png deleted file mode 100644 index 6aed09aab155f98c106277d1a264671d077a3b66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!VDzk-zB62Db50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(LEa?g_s7#fA^rfL5LX}#0?Je0YFhsP|37ac|7IYUu_VYZn8D%MjWiG^ z$=lt9r9b0lAdsWu>Eak-aXL9cqSHZuSKx}m5*8LMJ%_!@h zljQC0!qT5{GZ4tp^mK6yu{fQaAkpa{z}u6xpo>jWRb+w1Dn@AmGdISz#ZoIK{cvN{ aWni$1RM)qVXxt9e#Ng@b=d#Wzp$Py|8!n6h diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.png b/Source/Core/DolphinWX/resources/Flag_Italy.png deleted file mode 100644 index 2b2a8ef1e2629d3bd8a34859c9497c3261a6505b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!VDzk-zB62Db50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L0N@s|BL{j5PyJAh%1l=fk|%Xw9Wtj|Nr&i44%=JvO=wGDL{P;p00i_>zopr01j3$00000 diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.png b/Source/Core/DolphinWX/resources/Flag_Japan.png deleted file mode 100644 index d68affd97241ffb1dcb2316fcbdc42a7a4646999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L6!OE`>wq}A*J zGIS9!avL*p9W!z)EG#cCFEB7LG&D3dH8nOiHa9mnIXO8xIyyW&JU%`?KR-W0K6OGu zLPJACMMXtNM@L9VNKsKyQc_Y@C|*`pR#zfeTq0IoU0q*aUtwWkWMpJ#XJ=_?X=-X} zYaUT-Ms;j#Y;JCDaBy&OadC4UPIYy4dSr}yWsQF%Q-6PdhlhuVh=_`cij0hml$4Z~ zmX?^9n4O)SqobpyrlzcwudSA`uMs)3QF62pH@3F6x3{;ty1Kikyt})*!>_}}3^2$R zImjD6$rn1ww#mxM%FZlI(!kEw*VouubJ*C}+9?6?CkHl#qaO$ z@V&?J#m({5+w#iN^Yiod)!X*=_WAkw`uO_#`uh9(`~3X;{`>s?{Qdv`|F>lRtpET3 z0d!JMQvg8b*k%9#00Cl4M?`8RVwDa6009z7L_t(Y$75g^1;ZaO5&)E2kcAge&w@}? zgF~rpfvcc#IKudFV*z*SS`fjduFRhbGe4P6SzSAtniiys=?h7?WMySUg@naqW@Wjk z3Y&;H68gmaU4Jg$$L8 z3N1wuL{TBGq@@;3-AMKmu}nauodhdkzoAxK)3Cy!b(J{^M#10*04nFV=^PKAP5=M^ M07*qoM6N<$g3yyYY5)KL diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.png b/Source/Core/DolphinWX/resources/Flag_Sdk.png deleted file mode 100644 index 803aab2b9a17a1bc2a6d29a05f2407572a26319d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 588 zcmW-eZAg;=6oub+n{IASrA=GYEgQ4QF&HKa%GRtcx2DT2G5irTNo9X3+O#N$CgxfY zgqleVDlr>m!-;HBSTHOHjtVjSz?BH|t6X0{oFwP%T^G)MxaZ$F*HdS%=5xhdf*|-t zgU(8`iB=(pN$*AJ-BubImkf;#g5U{KB8i7y5pA-a##%i)M)C+{#f2lcCunP{uBKj3 z^Z!sJ2?hg9CRi+_r6D~XY&JL?WMqKLMP?@Wd}L)II~zGU5D1W)3$Yma`6wuWL;|T4 zg@usGAeTd-fKrK)5|oueqd{#gEEY60ps^7)8`|1nx1+rs9UXAF;C92~K~E2Qd(qd2 z{(gA97#zgV5PUw2jKJ^5=qLgKjE^H2L@0!C7?YETMlmyk*;&M5SXn_lj@4DHtzmr~ z8ync%L?VIhZ6uS}*}?8ED2ke5@BF0Gl1{7nG@)IcPqjrho2qpr#ZZ2sk9ni6s@^cQ zbzd(CtAt(W?1vkcVzDPL_l79S@tCo+tnJ=VEgWw>^|$E9guFuXnKDsTUzz@kdh#gw zeN6g6^43je?pI3AU$N!g2%ccwd%s+2QUsb~c?*i0o@tHD!8oLQTJZbL^T@P$l(p7% zQrJ~Fx2PdZSBvJF_T*dDqU+>9W$`k{d|CTwNqBZRp0oQ=kd&V(AGju;a;81t`h4nj z(L&h)?bvHIFA@oSn-lV1bRXQOEsi=|;i@|=lEBIzX^q$S=~*YE^jC}3Vz-sQdv!~s S8thG^er?p7b^c>bo&Nv@3KIGN diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.png b/Source/Core/DolphinWX/resources/Flag_Taiwan.png deleted file mode 100644 index d5bb1007f1cb3a62785204cf902e9c0d5b7d91fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(L6^zR&_Ed|36`};5S_g|ba;o`Jum#0m;GJX1$n>XLzy7m4a1H=FS|DW+}v<4c)SQ6wH z%;50s2FM|dN#5=*;@sC}^aDA`o-U3d9>?Ea_2z3(;BgIP=~B@8vH17>mC0&W6Q-|t zdGi2ort}n{|JUzU$X(bPlr372X22(*V6VSZJw{;-`}^ny)|@kE<}CjEhTG(4q1Oq? r1KT;O*q=^fQBi1AWBf8*^T_YHoGEIeFUz+c1Nq3))z4*}Q$iB}BFSpY diff --git a/Source/Core/DolphinWX/resources/Flag_USA.png b/Source/Core/DolphinWX/resources/Flag_USA.png deleted file mode 100644 index e34f11c274a62a83baefc7c412f694efc8a759ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmeAS@N?(olHy`uVBq!ia0vp^2|%pC!3-pC$@QiIDb50q$YKTtZeb8+WSBKa0w~B{ z;_2(kewUG(!9Z0e{ACCO10zR(Plzi}3J4q>3Z0#bJ>1JZJ%Fgf%c~+JxIQGfAvB~h zEVLmayeT5QIU>9zGNL&uvL!mIIXVhRw#GyQQG0AmYivwgLVQ<3LT6%PS5jg}Qc_QH zQfG2fcXCosN^)09a(7BHkkOl((v_Ohotn~n~~m^k=~yHWM}keWB|#DnHl|=851%y`?I_Xvoia# zfQ-xuS(y{Fvih^KCT3?%$Oe&+$=lr}yq4>xJdktE)5S5wG|w$64Nh;e%R^U z*YUQ6fg@tm=B(~@JSSsMRXH=T{9#gFbK~p-1EIZKObQ8EUB!*}-yJVHzvh(7Jl93h zi(av+nSHz`$iSHFx5WJN#chhh$F!Lg1Y*>0zm%Gq_~`WkNk#z!k*9q2GmF0_-}~Ue zz_KW4rs{8L{s{^G4GsPe5B?Ak{u~_s9v=Q5AO0X9{wF8?FE9QvG5#|%{xmfHHa7k} zJ^n{W{!vl>XJ`IsX#RS7{(OA?fPnsjg8qkx{*sdZlav0Gl>U~M{-UD(q@@0=tp2X9 z{;#k8u(1BIvHr8O{#h$($fCa)c)t^{^;ob>FNIM?f(1w{`~y^ z00960{}Eq~%K!iX0d!JMQvg8b*k%9#00Cl4M?^YK3B>vU006B?L_t(Y$L*Cj62d?b z1jQkQ2jRWw<)B$u2@hG3039qn!AMyPAwdCG z@`9q5qEYg*%o65QM$kdqbzA6qf&+pr+NRV*L~!fbmSy+v{`NP+J8&`>=%+#pqVQ#E bG|}e)HLP;7p8n7E00000NkvXXu0mjfY&zVt From 7fdfd1ef655e95a8c4f17480e4789f005a68848e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Thu, 10 Jan 2013 19:20:47 -0600 Subject: [PATCH 06/17] Make all flags 2 pixels taller. Aspect-ratio is now correct for nearly all flags. --- .../Core/DolphinWX/resources/Flag_Europe.xpm | 129 +++++---- .../Core/DolphinWX/resources/Flag_France.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Germany.xpm | 22 +- .../Core/DolphinWX/resources/Flag_Italy.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Japan.xpm | 71 ++--- .../Core/DolphinWX/resources/Flag_Korea.xpm | 234 ++++++++--------- Source/Core/DolphinWX/resources/Flag_Sdk.xpm | 4 +- .../Core/DolphinWX/resources/Flag_Taiwan.xpm | 68 ++--- Source/Core/DolphinWX/resources/Flag_USA.xpm | 247 +++++++++--------- .../Core/DolphinWX/resources/Flag_Unknown.xpm | 4 +- 10 files changed, 410 insertions(+), 377 deletions(-) diff --git a/Source/Core/DolphinWX/resources/Flag_Europe.xpm b/Source/Core/DolphinWX/resources/Flag_Europe.xpm index ea966ec317..3ab8534066 100644 --- a/Source/Core/DolphinWX/resources/Flag_Europe.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Europe.xpm @@ -1,50 +1,66 @@ /* XPM */ static const char * Flag_Europe_xpm[] = { -"96 32 43 1", +"96 32 60 1", " c None", ". c #000000", "+ c #003399", -"@ c #043797", -"# c #013498", -"$ c #8F8845", -"% c #8C8645", -"& c #16408C", -"* c #DDB715", -"= c #415972", -"- c #848348", -"; c #84834A", -"> c #425A71", -", c #737754", -"' c #234884", -") c #4D626A", -"! c #B6A02D", -"~ c #0C3B92", -"{ c #B7A12C", -"] c #465E6F", -"^ c #AE9B30", -"/ c #AE9C30", -"( c #3A5676", -"_ c #BBA229", -": c #16418C", -"< c #BAA22A", -"[ c #395577", -"} c #2B4D7F", -"| c #B8A12B", -"1 c #BAA22B", -"2 c #2A4D7F", -"3 c #4D626B", -"4 c #B5A02D", -"5 c #B6A02C", -"6 c #AD9D31", -"7 c #103D8F", -"8 c #6B7358", -"9 c #1B4489", -"0 c #063795", -"a c #E0B912", -"b c #485E6F", -"c c #495D6E", -"d c #E0B913", -" ", +"@ 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", " ", " ", " ", @@ -52,20 +68,22 @@ static const char * Flag_Europe_xpm[] = { "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".+++++++++++@+#$%#+@+++++++++++. ", -".++++++++++&*=+-;+>*&++++++++++. ", -".+++++++++++,'++++',+++++++++++. ", -".++++++++)!~++++++++~{)++++++++. ", -".++++++++]^++++++++++/]++++++++. ", +".+++++++++++++@#$@+++++++++++++. ", +".++++++++++%&*+=-+*;%++++++++++. ", +".++++++++++>,'+))+!~>++++++++++. ", +".+++++++++{+]]++++]]+{+++++++++. ", +".++++++++^/(++++++++(_:++++++++. ", +".++++++++<[++++++++++}|++++++++. ", +".++++++++]++++++++++++]++++++++. ", +".+++++++123++++++++++341+++++++. ", +".+++++++56++++++++++++75+++++++. ", ".++++++++++++++++++++++++++++++. ", -".+++++++(_:++++++++++:<[+++++++. ", -".+++++++}|++++++++++++12+++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++34~++++++++~53++++++++. ", -".++++++++]/++++++++++6]++++++++. ", -".++++++++++789++++987++++++++++. ", -".++++++++++0ab#$%#cd0++++++++++. ", -".++++++++++++++-;++++++++++++++. ", +".++++++++890++++++++0a8++++++++. ", +".++++++++bcd++++++++def++++++++. ", +".++++++++))+g++++++g+))++++++++. ", +".++++++++++hij+kl+mnh++++++++++. ", +".+++++++++++op@qr@ps+++++++++++. ", +".++++++++++++++tu++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", "................................ ", @@ -74,5 +92,4 @@ static const char * Flag_Europe_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_France.xpm b/Source/Core/DolphinWX/resources/Flag_France.xpm index f53abf6822..1d71b3430d 100644 --- a/Source/Core/DolphinWX/resources/Flag_France.xpm +++ b/Source/Core/DolphinWX/resources/Flag_France.xpm @@ -10,7 +10,6 @@ static const char * Flag_France_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", @@ -30,11 +29,12 @@ static const char * Flag_France_xpm[] = { ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Germany.xpm b/Source/Core/DolphinWX/resources/Flag_Germany.xpm index cd925bd2c8..e178b30edf 100644 --- a/Source/Core/DolphinWX/resources/Flag_Germany.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Germany.xpm @@ -1,11 +1,12 @@ /* XPM */ static const char * Flag_Germany_xpm[] = { -"96 32 4 1", +"96 32 6 1", " c None", ". c #000000", -"+ c #DD0000", -"@ c #FFCE00", -" ", +"+ c #4A0000", +"@ c #DD0000", +"# c #F48A00", +"$ c #FFCE00", " ", " ", " ", @@ -18,22 +19,23 @@ static const char * Flag_Germany_xpm[] = { "................................ ", "................................ ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", -".++++++++++++++++++++++++++++++. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".##############################. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", +".$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm index 78d39a848c..d0832f2d8a 100644 --- a/Source/Core/DolphinWX/resources/Flag_Italy.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm @@ -10,7 +10,6 @@ static const char * Flag_Italy_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", @@ -30,11 +29,12 @@ static const char * Flag_Italy_xpm[] = { ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", ".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", +".++++++++++@@@@@@@@@@##########. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Japan.xpm b/Source/Core/DolphinWX/resources/Flag_Japan.xpm index baf2c5982c..bdd86a6882 100644 --- a/Source/Core/DolphinWX/resources/Flag_Japan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Japan.xpm @@ -1,26 +1,34 @@ /* XPM */ static const char * Flag_Japan_xpm[] = { -"96 32 19 1", +"96 32 28 1", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #FEFDFD", -"# c #F1C9D3", -"$ c #E9AAB9", -"% c #E69FB0", -"& c #C41F47", -"* c #BC002D", -"= c #C42047", -"- c #E6A1B2", -"; c #DA748D", -"> c #DB758D", -", c #EBB4C1", -"' c #ECB6C3", -") c #CD4263", -"! c #CE4465", -"~ c #BF0D38", -"{ c #C00E39", -" ", +"@ 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", " ", " ", " ", @@ -29,18 +37,20 @@ static const char * Flag_Japan_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", -".++++++++++++@#$$#@++++++++++++. ", -".+++++++++++%&****=-+++++++++++. ", -".++++++++++;********>++++++++++. ", -".+++++++++,**********'+++++++++. ", -".+++++++++)**********!+++++++++. ", -".+++++++++~**********{+++++++++. ", -".+++++++++~**********{+++++++++. ", -".+++++++++)**********!+++++++++. ", -".+++++++++,**********'+++++++++. ", -".++++++++++;********>++++++++++. ", -".+++++++++++%&****=-+++++++++++. ", -".++++++++++++@#$$#@++++++++++++. ", +".++++++++++++++++++++++++++++++. ", +".+++++++++++@#$%%&*=+++++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++)!>>>>>>>>~{+++++++++. ", +".+++++++++]>>>>>>>>>>^+++++++++. ", +".+++++++++$>>>>>>>>>>/+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++(>>>>>>>>>>_+++++++++. ", +".+++++++++&>>>>>>>>>>:+++++++++. ", +".+++++++++<>>>>>>>>>>[+++++++++. ", +".+++++++++{!>>>>>>>>~@+++++++++. ", +".++++++++++-;>>>>>>,'++++++++++. ", +".+++++++++++@#$}}&*=+++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", @@ -50,5 +60,4 @@ static const char * Flag_Japan_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Korea.xpm b/Source/Core/DolphinWX/resources/Flag_Korea.xpm index 32ce1a5289..26ebd9fa24 100644 --- a/Source/Core/DolphinWX/resources/Flag_Korea.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Korea.xpm @@ -1,114 +1,105 @@ /* XPM */ static const char * Flag_Korea_xpm[] = { -"96 32 107 2", +"96 32 99 2", " c None", ". c #000000", "+ c #FFFFFF", -"@ c #E4E4E4", -"# c #BABABA", -"$ c #3A3A3A", -"% c #7F7F7F", -"& c #E8E8E8", -"* c #393939", -"= c #BBBBBB", -"- c #EBEBEB", -"; c #2F2F2F", -"> c #6A6A6A", -", c #616161", -"' c #373737", -") c #FAFAFA", -"! c #F9F9F9", -"~ c #363636", -"{ c #6E6E6E", -"] c #EFEFEF", -"^ c #FCFCFC", -"/ c #424242", -"( c #757575", -"_ c #3C3C3C", -": c #454545", -"< c #B7B7B7", -"[ c #FEFBFC", -"} c #EFBAC5", -"| c #E48E9E", -"1 c #E58F9F", -"2 c #F0BDC7", -"3 c #FEFCFD", -"4 c #676767", -"5 c #3E3E3E", -"6 c #878787", -"7 c #D7D7D7", -"8 c #707070", -"9 c #2C2C2C", -"0 c #717171", -"a c #F1C5CD", -"b c #CE2C4C", -"c c #C60C30", -"d c #F2CAD2", -"e c #9D9D9D", -"f c #D8D8D8", -"g c #F6F6F6", -"h c #B6B6B6", -"i c #474747", -"j c #FBFBFB", -"k c #F1D4DB", -"l c #C81639", -"m c #C9173A", -"n c #F5D5DB", -"o c #484848", -"p c #B35172", -"q c #D85A73", -"r c #56285E", -"s c #731D4E", -"t c #113172", -"u c #0B3274", -"v c #5C2256", -"w c #C81B3E", -"x c #0C3274", -"y c #6B1E51", -"z c #B41037", -"A c #AF1139", -"B c #572258", -"C c #003478", -"D c #7F2453", -"E c #423E75", -"F c #6C4675", -"G c #ECECEC", -"H c #A3A3A3", -"I c #343434", -"J c #C9B6C9", -"K c #093375", -"L c #D2C0CE", -"M c #353535", -"N c #6C6C6C", -"O c #303030", -"P c #BBA7BC", -"Q c #1B3372", -"R c #1D3372", -"S c #C3AFC3", -"T c #515151", -"U c #888888", -"V c #8C8C8C", -"W c #565656", -"X c #A6A6A6", -"Y c #FAF8FA", -"Z c #AD96B1", -"` c #7B658D", -" . c #7A648C", -".. c #AC95AF", -"+. c #646464", -"@. c #8A8A8A", -"#. c #949494", -"$. c #525252", -"%. c #5D5D5D", -"&. c #3F3F3F", -"*. c #434343", -"=. c #5F5F5F", -"-. c #696969", -";. c #CACACA", -">. c #969696", -",. c #F3F3F3", -"'. c #989898", -" ", +"@ 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", " ", " ", " ", @@ -116,20 +107,22 @@ static const char * Flag_Korea_xpm[] = { ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", ". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", -". + + + + + + # $ % & + + + + + + + + + + & % * = + + + + + + . ", -". + + + + + - ; > , ' ) + + + + + + + + ! ~ , > { ] + + + + + . ", -". + + + + ^ / ( _ : < + + [ } | 1 2 3 + + < 4 5 6 / ^ + + + + . ", -". + + + + 7 8 9 8 0 + + a b c c c c b d + + e 8 9 8 f + + + + . ", -". + + + + + g h i j + k l c c c c c c m n + j o h g + + + + + . ", -". + + + + + + + ^ + + p c c c c c c c c q + + ^ + + + + + + + . ", -". + + + + + + + + + + r c c c c s t u v w + + + + + + + + + + . ", -". + + + + + + + + + + x y z A B C C C C D + + + + + + + + + + . ", -". + + + + + + + ^ + + E C C C C C C C C F + + ^ + + + + + + + . ", -". + + + + + G H I g + J K C C C C C C u L + g M H G + + + + + . ", -". + + + + 7 N O 8 0 + + P Q C C C C R S + + e 0 O N f + + + + . ", -". + + + + + T U V W X + + Y Z ` ...Y + + X +.@.#.$.+ + + + + . ", -". + + + + + - ; N %.&.) + + + + + + + + ! *.=.N -.] + + + + + . ", -". + + + + + + ;.&.>.,.+ + + + + + + + + + ,.'.5 ;.+ + + + + + . ", +". + + + + + + # $ % + + + + + + + + + + + + & $ # + + + + + + . ", +". + + + + + + * = - ; > + + + + + + + + > ; , = ' + + + + + + . ", +". + + + + + ) ! ~ { ] + + + + + + + + + + ^ / ( _ : + + + + + . ", +". + + + + < [ } | 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 @.= ' + + + + + + . ", +". + + + + + + #.$.%.+ + + + + + + + + + + + %.$.#.+ + + + + + . ", ". + + + + + + + @ + + + + + + + + + + + + + + @ + + + + + + + . ", ". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . ", ". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", @@ -138,5 +131,4 @@ static const char * Flag_Korea_xpm[] = { " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm index 0df81bf81f..f4a5504044 100644 --- a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Sdk.xpm @@ -84,12 +84,12 @@ static const char * Flag_Sdk_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".+@#$%&*+++==-;>,'+++==+++)!~{+. ", ".+]=^/(]+++==+_:<[}++==++|123++. ", ".+4=_++++++==+++5=6++==+7890+++. ", @@ -104,11 +104,11 @@ static const char * Flag_Sdk_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm index da0f13de47..19aa7cc4f6 100644 --- a/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Taiwan.xpm @@ -1,44 +1,52 @@ /* XPM */ static const char * Flag_Taiwan_xpm[] = { -"96 32 24 1", +"96 32 32 1", " c None", ". c #000000", "+ c #000095", "@ c #FE0000", -"# c #12129C", -"$ c #010195", -"% c #3D3DAE", -"& c #0B0B9A", -"* c #1B1BA0", -"= c #8F8FD0", -"- c #9696D3", -"; c #9090D1", -"> c #1A1AA0", -", c #2424A4", -"' c #9696D4", -") c #DADAEF", -"! c #FFFFFF", -"~ c #D9D9EF", -"{ c #9797D4", -"] c #040497", -"^ c #5959BA", -"/ c #8E8ECF", -"( c #8E8ED1", -"_ c #8F8FD1", -" ", +"# 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", " ", " ", " ", " ", "................................ ", ".+++++++++++++++@@@@@@@@@@@@@@@. ", -".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", -".++++&*=-;>&++++@@@@@@@@@@@@@@@. ", -".++++,')!~{,++++@@@@@@@@@@@@@@@. ", -".+++]^;!!!;^]+++@@@@@@@@@@@@@@@. ", -".++++,')!~{,++++@@@@@@@@@@@@@@@. ", -".++++&*/(_>&++++@@@@@@@@@@@@@@@. ", -".+++++#$%$#+++++@@@@@@@@@@@@@@@. ", +".+++++#+$+#+++++@@@@@@@@@@@@@@@. ", +".+++++%&*=-+++++@@@@@@@@@@@@@@@. ", +".++++;>,')!~++++@@@@@@@@@@@@@@@. ", +".++++{]^^^/{++++@@@@@@@@@@@@@@@. ", +".+++(_:^^^<_(+++@@@@@@@@@@@@@@@. ", +".++++;>[')!~++++@@@@@@@@@@@@@@@. ", +".+++++}|12{+++++@@@@@@@@@@@@@@@. ", +".+++++#+3+#+++++@@@@@@@@@@@@@@@. ", ".+++++++++++++++@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", @@ -49,11 +57,11 @@ static const char * Flag_Taiwan_xpm[] = { ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", ".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", +".@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; diff --git a/Source/Core/DolphinWX/resources/Flag_USA.xpm b/Source/Core/DolphinWX/resources/Flag_USA.xpm index 44260eca52..2b1d466240 100644 --- a/Source/Core/DolphinWX/resources/Flag_USA.xpm +++ b/Source/Core/DolphinWX/resources/Flag_USA.xpm @@ -1,123 +1,128 @@ /* XPM */ static const char * Flag_USA_xpm[] = { -"96 32 88 1", -" c None", -". c #000000", -"+ c #545380", -"@ c #5C5B87", -"# c #565580", -"$ c #5B5A85", -"% c #585782", -"& c #5B5A84", -"* c #5A5984", -"= c #585783", -"- c #5C5B85", -"; c #555481", -"> c #5D5C85", -", c #54537F", -"' c #B22234", -") c #494878", -"! c #64638A", -"~ c #686891", -"{ c #66658B", -"] c #66668F", -"^ c #67668D", -"/ c #65658E", -"( c #68678E", -"_ c #65648D", -": c #6A6A8F", -"< c #62628C", -"[ c #4A4A78", -"} c #E1AAB1", -"| c #5B5A83", -"1 c #6B6A92", -"2 c #68678D", -"3 c #6A698E", -"4 c #696890", -"5 c #6A6990", -"6 c #676790", -"7 c #6D6C91", -"8 c #68678F", -"9 c #6C6B92", -"0 c #595883", -"a c #EDCCD0", -"b c #484777", -"c c #66668E", -"d c #69688F", -"e c #6B6A91", -"f c #6A6991", -"g c #6A6A91", -"h c #686790", -"i c #6E6D92", -"j c #67678E", -"k c #494877", -"l c #585784", -"m c #69698F", -"n c #61618A", -"o c #676690", -"p c #65648B", -"q c #65648E", -"r c #66658D", -"s c #64638D", -"t c #605F8A", -"u c #68688F", -"v c #F3DDE0", -"w c #434273", -"x c #64638B", -"y c #686890", -"z c #66658E", -"A c #63628C", -"B c #DB99A1", -"C c #6A698F", -"D c #626188", -"E c #67668E", -"F c #636289", -"G c #66658C", -"H c #63628B", -"I c #606089", -"J c #B83243", -"K c #414071", -"L c #65648A", -"M c #67668F", -"N c #6B6A90", -"O c #6E6D94", -"P c #64638C", -"Q c #FFFFFF", -"R c #5D5C86", -"S c #6D6C92", -"T c #65648C", -"U c #67678F", -"V c #CA6672", -"W c #6A4A71", -" ", -" ", -" ", -" ", -" ", -"................................ ", -".+@#$%&*=-;>,''''''''''''''''''. ", -".)!~{]^/(_:<[}}}}}}}}}}}}}}}}}}. ", -".|12134567890aaaaaaaaaaaaaaaaaa. ", -".bc9d1efghijk''''''''''''''''''. ", -".lmnopqrs2tu0vvvvvvvvvvvvvvvvvv. ", -".wx9^5y8fziAwBBBBBBBBBBBBBBBBBB. ", -".$CDEFGqH2IC&JJJJJJJJJJJJJJJJJJ. ", -".KLiMeudNrOPKQQQQQQQQQQQQQQQQQQ. ", -".RST4_U4qNASRVVVVVVVVVVVVVVVVVV. ", -".WWWWWWWWWWWWVVVVVVVVVVVVVVVVVV. ", -".QQQQQQQQQQQQQQQQQQQQQQQQQQQQQQ. ", -".JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ. ", -".BBBBBBBBBBBBBBBBBBBBBBBBBBBBBB. ", -".vvvvvvvvvvvvvvvvvvvvvvvvvvvvvv. ", -".''''''''''''''''''''''''''''''. ", -".aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa. ", -".}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}. ", -".''''''''''''''''''''''''''''''. ", -"................................ ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +"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.xpm b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm index 381d43f304..d67ac42ee0 100644 --- a/Source/Core/DolphinWX/resources/Flag_Unknown.xpm +++ b/Source/Core/DolphinWX/resources/Flag_Unknown.xpm @@ -64,12 +64,12 @@ static const char * Flag_Unknown_xpm[] = { " ", " ", " ", -" ", "................................ ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", ".+@@++++@@++@@#+++@@++@@+++$%&*. ", ".+@@++++@@++@@@=++@@++@@++-;>,+. ", ".+@@++++@@++@@#'++@@++@@+)!~{++. ", @@ -84,11 +84,11 @@ static const char * Flag_Unknown_xpm[] = { ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", ".++++++++++++++++++++++++++++++. ", +".++++++++++++++++++++++++++++++. ", "................................ ", " ", " ", " ", " ", " ", -" ", " "}; From ad05d568b9fce5f983dd06cfedb0904ada8ce9ab Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Fri, 11 Jan 2013 15:47:38 +0100 Subject: [PATCH 07/17] PixelShaderGen: Change error strings to be unique so that we can identify unexpected behavior more easily. --- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index fdb5f21a51..f10fd437a8 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -287,10 +287,10 @@ static const char *tevKSelTableC[] = // KCSEL "0.375f,0.375f,0.375f", // 3_8 = 0x05 "0.25f,0.25f,0.25f", // 1_4 = 0x06 "0.125f,0.125f,0.125f", // 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b + "ERROR1", // 0x08 + "ERROR2", // 0x09 + "ERROR3", // 0x0a + "ERROR4", // 0x0b I_KCOLORS"[0].rgb", // K0 = 0x0C I_KCOLORS"[1].rgb", // K1 = 0x0D I_KCOLORS"[2].rgb", // K2 = 0x0E @@ -323,14 +323,14 @@ static const char *tevKSelTableA[] = // KASEL "0.375f",// 3_8 = 0x05 "0.25f", // 1_4 = 0x06 "0.125f",// 1_8 = 0x07 - "ERROR", // 0x08 - "ERROR", // 0x09 - "ERROR", // 0x0a - "ERROR", // 0x0b - "ERROR", // 0x0c - "ERROR", // 0x0d - "ERROR", // 0x0e - "ERROR", // 0x0f + "ERROR5", // 0x08 + "ERROR6", // 0x09 + "ERROR7", // 0x0a + "ERROR8", // 0x0b + "ERROR9", // 0x0c + "ERROR10", // 0x0d + "ERROR11", // 0x0e + "ERROR12", // 0x0f I_KCOLORS"[0].r", // K0_R = 0x10 I_KCOLORS"[1].r", // K1_R = 0x11 I_KCOLORS"[2].r", // K2_R = 0x12 @@ -405,7 +405,7 @@ static const char *tevCInputTable[] = // CC "float3(0.5f, 0.5f, 0.5f)", // HALF "(ckonsttemp.rgb)", //"konsttemp.rgb", // KONST "float3(0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR" + "PADERROR1", "PADERROR2", "PADERROR3", "PADERROR4" }; static const char *tevAInputTable[] = // CA @@ -427,17 +427,17 @@ static const char *tevAInputTable[] = // CA "crastemp", // RASA, "ckonsttemp", // KONST, (hw1 had quarter) "float4(0.0f, 0.0f, 0.0f, 0.0f)", // ZERO - "PADERROR", "PADERROR", "PADERROR", "PADERROR", - "PADERROR", "PADERROR", "PADERROR", "PADERROR", + "PADERROR5", "PADERROR6", "PADERROR7", "PADERROR8", + "PADERROR9", "PADERROR10", "PADERROR11", "PADERROR12", }; static const char *tevRasTable[] = { "colors_0", "colors_1", - "ERROR", //2 - "ERROR", //3 - "ERROR", //4 + "ERROR13", //2 + "ERROR14", //3 + "ERROR15", //4 "alphabump", // use bump alpha "(alphabump*(255.0f/248.0f))", //normalized "float4(0.0f, 0.0f, 0.0f, 0.0f)", // zero From 482360906badd215231fd2b4ce9e62009dd0c467 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 11 Jan 2013 11:24:52 -0500 Subject: [PATCH 08/17] Convert relative paths to absolute when opening containing folder of an iso. Fixes issue 5879. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 2e31843ef9..6f75674c29 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -982,9 +983,11 @@ void CGameListCtrl::OnOpenContainingFolder(wxCommandEvent& WXUNUSED (event)) const GameListItem *iso = GetSelectedISO(); if (!iso) return; - std::string path; - SplitPath(iso->GetFileName(), &path, 0, 0); - WxUtils::Explore(path.c_str()); + + wxString strPath(iso->GetFileName().c_str(), wxConvUTF8); + wxFileName path = wxFileName::FileName(strPath); + path.MakeAbsolute(); + WxUtils::Explore(path.GetPath().char_str()); } void CGameListCtrl::OnOpenSaveFolder(wxCommandEvent& WXUNUSED (event)) From cb71158df45f4c72c325c9c905ab10d43c31a52a Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 13:47:19 -0600 Subject: [PATCH 09/17] Be consistent with uppercase letters. --- Source/Core/DolphinWX/Src/GameListCtrl.cpp | 4 ++-- .../Core/DolphinWX/resources/{Flag_Sdk.xpm => Flag_SDK.xpm} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename Source/Core/DolphinWX/resources/{Flag_Sdk.xpm => Flag_SDK.xpm} (99%) diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp index 1b35e06c29..366f8c95c3 100644 --- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp +++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp @@ -44,7 +44,7 @@ #include "../resources/Flag_Taiwan.xpm" #include "../resources/Flag_Korea.xpm" #include "../resources/Flag_Unknown.xpm" -#include "../resources/Flag_Sdk.xpm" +#include "../resources/Flag_SDK.xpm" #include "../resources/Platform_Wad.xpm" #include "../resources/Platform_Wii.xpm" @@ -209,7 +209,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_Sdk_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/resources/Flag_Sdk.xpm b/Source/Core/DolphinWX/resources/Flag_SDK.xpm similarity index 99% rename from Source/Core/DolphinWX/resources/Flag_Sdk.xpm rename to Source/Core/DolphinWX/resources/Flag_SDK.xpm index f4a5504044..169caacdcc 100644 --- a/Source/Core/DolphinWX/resources/Flag_Sdk.xpm +++ b/Source/Core/DolphinWX/resources/Flag_SDK.xpm @@ -1,5 +1,5 @@ /* XPM */ -static const char * Flag_Sdk_xpm[] = { +static const char * Flag_SDK_xpm[] = { "96 32 79 1", " c None", ". c #000000", From 35dce209ae7b3edfbecd8c6aea5cc64c436e2402 Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 14:10:36 -0600 Subject: [PATCH 10/17] Gave the "platform" icons a complete white background rather than a slightly-uglier white box. (apparently XPM only supports a 1-bit alpha channel) Centered the icons a bit better too. --- .../DolphinWX/resources/Platform_Gamecube.xpm | 476 ++++++----- .../Core/DolphinWX/resources/Platform_Wad.xpm | 762 +++++++++--------- .../Core/DolphinWX/resources/Platform_Wii.xpm | 410 +++++----- 3 files changed, 820 insertions(+), 828 deletions(-) diff --git a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm index 8fbe5c3d1f..8ec3f4bddb 100644 --- a/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Gamecube.xpm @@ -1,241 +1,239 @@ /* XPM */ -static const char *Platform_Gamecube_xpm[] = { +static const char * Platform_Gamecube_xpm[] = { "96 32 204 2", -"E. c #B1B0B0", -"] c #8E8B8C", -"`. c #E8E8E8", -"O c #CFCECF", -"q. c #F7F7F7", -" . c #231F20", -"N. c #191415", -"x. c #191416", -"~ c #322E2F", -"G. c #4B4849", -"S. c #646263", -"@. c #5A5758", -"^. c #504C4D", -"4 c #828080", -"p. c #C3C3C3", -":. c #B9B8B8", -"H c #C8C7C7", -"c. c #BEBCBC", -"L c #E1E1E1", -"G c #F0F0EF", -"n c #F0F0F0", -"L. c #E6E5E6", -". c #FFFFFF", -"! c #1C1819", -"d. c #2B2728", -"z c #535051", -"H. c #9E9E9E", -"a c #716E6F", -"9 c #8A8888", -"1X c #B2B1B1", -"V. c #8F8C8D", -"XX c #A8A6A7", -"X. c #DFDEDF", -"o. c #EEEDED", -";X c #151112", -", c #242021", -"$ c #3D3A3A", -"j. c #1A1517", -"]. c #292426", -"f. c #656364", -"[. c #6A6768", -"y. c #929091", -"& c #BAB9B9", -"I. c #D3D3D3", -"# c #B0AEAF", -"o c #C9C8C8", -"%X c #C9C8C9", -",X c #F1F1F1", -"7 c #2C2829", -"5. c #221D1E", -"!. c #3B3738", -"x c #221D1F", -"[ c #312C2D", -"u c #7C7A7A", -"-X c #8B8989", -"A c #B3B2B2", -"F. c #C2C1C1", -"a. c #B8B6B6", -"P c #C2C1C2", -">X c #D1D0D1", -"K c #EAEAEA", -"#. c #C7C5C6", -"0 c #E0DFDF", -"$X c #F9F9F9", -"}. c #EFEEEE", -"v. c #252121", -"8 c #252122", -"{ c #1B1617", -"&. c #3E3B3D", -"d c #343031", -"+X c #2A2526", -"y c #2A2527", -"< c #5C5959", -"OX c #848282", -"I c #615D5E", -"#X c #898686", -"6. c #939192", -" c #2A2627", -"v c #393535", -":X c #615E5F", -"&X c #575354", -"J c #706D6E", -"2. c #A2A1A1", -">. c #7F7C7D", -/* pixels */ -" ", -" ", -" ", -" ", -" ", -" . . . . . . . . X o O + . . . . . . . . ", -" . . . . . . . @ # $ % & * . . . . . . . ", -" . . . . . = - ; : > > , < 1 2 . . . . . ", -" . . . . 3 4 , > 5 6 7 > 5 8 9 0 . . . . ", -" . X q w e r t y u i p a 5 t s d f * . . ", -" . g h j t s k 1 . . . + l z x c v & . . ", -" b n m M N B b . V C Z b . b A S D . F G ", -" H J @ K L . . P I x r U Y T . . . R E W ", -" Q ! ~ R . T ^ / ( ) ~ j _ ` . ' ] [ { } ", -" | . .... X.o.O.+.r s @.#.$.%.&.*.=., -. ", -" | .;.:.T >.E ,.<.1.2.<.3.4.5.> M ~ , -. ", -" | .;.:.. 6.7.8.9.0.q.w.e.5 5 r.t.e , -. ", -" | .;.:.. y.u.e i.p.a.s.=.d.f.g.| h 8 -. ", -" | .;.& . h.j.~ k.l.z._ =.x.:.. c.;.8 -. ", -" | .v.b.. n.m.M.N.B.V.N.t C.Z.. O.: 8 -. ", -" O.x A.S.D.. . F.G.H.J.z K.. . L.P.7 _ I. ", -" U.Y.e M.e T.n . D R.K g.. i E.=.t M 7.3 ", -" W.Q.!. .M.~.^./.+ . . 0.(.).5.t ._.H 2 ", -" . . `.'.~ s ].5 [.{.}.|. Xt 5..XXXi . . ", -" . . . . oXOX, +X@X6.#X! 5 8 h.L . . . . ", -" . . . . . $X%X&X*X=X-X;X:X>X2 . . . . . ", -" . . . . . . . ,XC XX c #F9F8F8", +", c #C7C7C7", +"' c #534F50", +") c #252021", +"! c #2A2627", +"~ c #242021", +"{ c #5C5959", +"] c #CECDCD", +"^ c #FBFBFB", +"/ c #D8D8D8", +"( c #828080", +"_ c #292526", +": c #2D282A", +"< c #2C2829", +"[ c #252122", +"} c #8A8888", +"| c #E0DFDF", +"1 c #E5E4E4", +"2 c #9B9999", +"3 c #302C2D", +"4 c #221E1E", +"5 c #282425", +"6 c #2A2527", +"7 c #7C7A7A", +"8 c #EDEDED", +"9 c #E8E7E7", +"0 c #716E6F", +"a c #221E1F", +"b c #343031", +"c c #868383", +"d c #D6D5D6", +"e c #262122", +"f c #1F1A1B", +"g c #595656", +"h c #C4C3C4", +"i c #535051", +"j c #221D1F", +"k c #1D181A", +"l c #393535", +"m c #F5F5F5", +"n c #F0F0F0", +"o c #ADACAC", +"p c #2E2A2B", +"q c #302C2C", +"r c #B1AFAF", +"s c #F2F1F1", +"t c #A6A4A5", +"u c #AEACAC", +"v c #B3B2B2", +"w c #A6A5A5", +"x c #EBEBEB", +"y c #F3F2F2", +"z c #F0F0EF", +"A c #C8C7C7", +"B c #706D6E", +"C c #EAEAEA", +"D c #E1E1E1", +"E c #C2C1C2", +"F c #615D5E", +"G c #676465", +"H c #CBCACA", +"I c #FEFEFE", +"J c #D5D5D5", +"K c #575455", +"L c #D1D1D1", +"M c #C5C4C4", +"N c #1C1819", +"O c #322E2F", +"P c #9D9B9C", +"Q c #211D1F", +"R c #201C1D", +"S c #332E2F", +"T c #241F20", +"U c #B0AFAF", +"V c #E9E8E8", +"W c #8E8B8C", +"X c #312C2D", +"Y c #1B1617", +"Z c #D5D4D5", +"` c #C7C6C6", +" . c #231F20", +".. c #B5B3B3", +"+. c #DFDEDF", +"@. c #EEEDED", +"#. c #C3C2C2", +"$. c #545050", +"%. c #5A5758", +"&. c #C7C5C6", +"*. c #F4F4F4", +"=. c #B4B2B2", +"-. c #3E3B3D", +";. c #262123", +">. c #312D2E", +",. c #D6D5D5", +"'. c #262223", +"). c #B9B8B8", +"!. c #7F7C7D", +"~. c #DCDBDB", +"{. c #ECECEC", +"]. c #9B999A", +"^. c #A2A1A1", +"/. c #D4D3D4", +"(. c #636161", +"_. c #221D1E", +":. c #939192", +"<. c #191516", +"[. c #322F2F", +"}. c #817F7F", +"|. c #FAFAFA", +"1. c #F7F7F7", +"2. c #777475", +"3. c #2F2B2C", +"4. c #3F3C3D", +"5. c #4D494A", +"6. c #929091", +"7. c #241F21", +"8. c #1A1617", +"9. c #C3C3C3", +"0. c #B8B6B6", +"a. c #1C1719", +"b. c #2B2728", +"c. c #656364", +"d. c #EFEFEF", +"e. c #8C898A", +"f. c #1A1517", +"g. c #231E1F", +"h. c #999898", +"i. c #8F8E8E", +"j. c #191416", +"k. c #BEBCBC", +"l. c #252121", +"m. c #BCBBBB", +"n. c #E3E3E3", +"o. c #635F60", +"p. c #272324", +"q. c #191415", +"r. c #999899", +"s. c #8F8C8D", +"t. c #6E6C6C", +"u. c #F3F3F3", +"v. c #2D292A", +"w. c #646263", +"x. c #E4E3E3", +"y. c #C2C1C1", +"z. c #4B4849", +"A. c #9E9E9E", +"B. c #979596", +"C. c #CDCCCD", +"D. c #E6E5E6", +"E. c #787676", +"F. c #D3D3D3", +"G. c #CAC9CA", +"H. c #171214", +"I. c #ADACAD", +"J. c #F1F0F0", +"K. c #B1B0B0", +"L. c #FAF9FA", +"M. c #BEBDBE", +"N. c #3B3738", +"O. c #211D1E", +"P. c #504C4D", +"Q. c #C4C2C3", +"R. c #BAB8B9", +"S. c #4C4849", +"T. c #423F40", +"U. c #E8E8E8", +"V. c #9C9A9B", +"W. c #292426", +"X. c #6A6768", +"Y. c #F2F1F2", +"Z. c #EFEEEE", +"`. c #605D5E", +" + c #2A2626", +".+ c #373435", +"++ c #A8A6A7", +"@+ c #DBDADB", +"#+ c #848282", +"$+ c #2A2526", +"%+ c #1B1718", +"&+ c #898686", +"*+ c #F9F9F9", +"=+ c #C9C8C9", +"-+ c #575354", +";+ c #151012", +">+ c #979595", +",+ c #8B8989", +"'+ c #151112", +")+ c #615E5F", +"!+ c #D1D0D1", +"~+ c #F1F1F1", +"{+ c #A2A0A1", +"]+ c #B2B1B1", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . + @ # $ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . % & * = - ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . > , ' ) ! ! ~ { ] ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . / ( ~ ! _ : < ! _ [ } | . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . + 1 2 3 4 5 6 7 8 9 0 _ 5 a b c ; . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . d e f 5 a g ] . . . $ h i j k l - . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . m n o p q r m . s t u m . m v w x . y z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . A B % C D . . E F j 4 G H I . . . J K L . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . M N O J . I P Q R S O f T U . V W X Y Z . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` . .... +.@.#.$.4 a %.&.*.=.-.;.>.~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).I !.K ~.{.].^.{./.(._.! p O ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. :.<.[.}.|.1.2.3._ _ 4.5.3 ~ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.).. 6.7.3 8.9.0.a.>.b.c.d.` e [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .'.- . e.f.O g.h.i.T >.j.).. k.'.[ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . ` .l.m.. n.o.p.q.r.s.q.5 t.u.. #.) [ ,.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . #.j v.w.x.. . y.z.A.B.i C.. . D.E.< T F.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . G.H.3 p.3 I.n . x J.C d.. 8 K.>.5 p <./ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . L.M.N. .p.O.P.Q.$ . . |.R.S._.5 .T.A ^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . U.V.O a W._ X.Y.Z.`. +5 _..+++8 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . @+#+~ $+%+:.&+N _ [ e.D . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . *+=+-+;+>+,+'+)+!+^ . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . ~+t ++{+]+*.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wad.xpm b/Source/Core/DolphinWX/resources/Platform_Wad.xpm index fcb309cedc..a89c3a0c9c 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wad.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wad.xpm @@ -1,384 +1,382 @@ /* XPM */ -static const char *Platform_Wad_xpm[] = { +static const char * Platform_Wad_xpm[] = { "96 32 347 2", -"hX c #71CBE2", -"v. c #DADCDC", -"a c #DDDDDE", -"!. c #DDDDDF", -"} c #E0E1E1", -"i c #76777B", -")X c #62D8F4", -"go c #5CD6F5", -"a. c #ECEBEC", -">. c #EFEFEF", -"FX c #6EDCF7", -"x. c #7C7F82", -"qo c #8CE3F7", -"sX c #9EE6F8", -"Z c #F2F3F3", -"oo c #A7E9F9", -"yX c #F2F3F4", -"Bo c #AAEAFA", -"c c #828488", -"3. c #85888A", -"X c #F8F8F8", -"*X c #85888B", -"do c #D1F4FC", -"po c #CEF3FC", -"H c #88898C", -"K. c #85888C", -"gX c #D7FCFF", -"6. c #8B8D8F", -"*o c #F8FEFE", -"`X c #F2FCFF", -" o c #EFFBFF", -";X c #F5FDFF", -"M. c #9A9B9E", -"] c #B8BABB", -"z. c #BEBFC1", -", c #D6D6D8", -"N c #E8E8E9", -"BX c #58D6F4", -"vo c #6AD9F5", -"ao c #79DEF7", -"zX c #4FD9FA", -"V c #7B7D81", -" . c #F1F1F0", -"r c #7E8184", -"!X c #94E4F8", -"m. c #F1F1F2", -"IX c #9DE7FA", -"Fo c #BEEFFB", -"Do c #B5ECFB", -"` c #84868A", -".. c #FAFAF9", -"PX c #B8F0FE", -"8 c #FAFAFA", -"Ho c #DCF6FD", -"yo c #E5F9FD", -"wo c #E2F8FD", -"rX c #DFF7FD", -"3X c #E2F8FE", -"# c #FDFEFD", -"QX c #FDFEFE", -"qX c #848C92", -"6X c #8A8E92", -"r. c #8D8F93", -"_ c #909396", -"u c #96989A", -">X c #84959C", -",. c #9C9DA0", -"A c #9FA1A3", -"'. c #9FA1A4", -"2 c #ABABAD", -"D. c #AEAFB2", -"l. c #B1B3B4", -"iX c #BDBDC0", -"D c #C3C5C5", -"( c #C6C6C8", -"v c #C9CACB", -"<. c #CCCECF", -" c None", -"| c #DBDCDD", -"w. c #E1E1E2", -"> c #E4E5E5", -"EX c #60D7F5", -" X c #EDEBEC", -"RX c #72DDF6", -"8o c #69DAF6", -"+X c #F0ECED", -"Y. c #EDEEEF", -"eo c #8AE2F8", -"g. c #F3F3F4", -"0o c #ABEAFA", -"]. c #F9F8F7", -"'X c #CCF2FC", -"no c #D8F6FD", -"J c #86888C", -"HX c #E7F8FC", -"$ c #FCFCFC", -"Jo c #F0FBFE", -"_X c #DEF8FF", -"to c #F3FCFE", -"/. c #8F9194", -"k c #8F9195", -"n c #95969A", -"`. c #989A9C", -"h c #9E9FA2", -"5X c #899EA7", -"0X c #8FA6AD", -"[. c #AAACAE", -"&. c #B9BABC", -"M c #C2C3C4", -"H. c #C5C7C8", -"f. c #CBCCCD", -"c. c #D1D1D2", -"1 c #DDDEDF", -"6o c #38CEF3", -"/X c #44CFF2", -"#o c #56D5F4", -"VX c #53D4F4", -"9X c #D4E7ED", -"jo c #59D6F5", -"bX c #56D5F5", -"Y c #ECECED", -".X c #F2EEEF", -"-. c #EFF0F0", -"LX c #74DCF7", -"aX c #80E0F8", -"7o c #7DDFF8", -"#X c #7F8184", -"xo c #95E4F8", -"o c #88E1F7", -"5o c #91E4F8", -"TX c #8BE2F8", -"pX c #F1F2F3", -".o c #9AE7F9", -"+. c #818387", -"YX c #B5EDFA", -"S. c #818388", -"R c #F7F7F7", -"Q c #F7F7F8", -"o c #FAFBFA", -"* c #FAFBFB", -"[ c #8A8C8E", -"WX c #EEFAFD", -"R. c #8A8C8F", -"W. c #909194", -"^. c #9C9EA1", -"V. c #A2A3A6", -";. c #A5A7A9", -"/ c #AEB0B1", -"U. c #B4B5B7", -"' c #BDBEC0", -"t c #C0C2C4", -"OX c #CCCCCD", -"C c #CCCCCE", -"j. c #CFD0D1", -"jX c #A5CBD6", -"P c #D5D5D6", -"f c #DBDDDC", -"t. c #E1E2E3", -"y c #E7E7E9", -"1o c #57D5F4", -"%o c #54D4F4", -":o c #66DAF6", -"4X c #CFE8EF", -"B. c #EDECED", -"nX c #45D5F9", -"4 c #F0F0F0", -"^X c #72DEF9", -"&o c #9FE7F8", -"s c #808184", -"(X c #99E5F8", -"d. c #7D8084", -"i. c #838588", -"2X c #F0F6F7", -"^ c #838589", -"Mo c #C0EFFB", -"Lo c #C3F0FC", -". c #F9F9FA", -"tX c #E7F9FD", -"L c #FFFEFE", -"d c #8C8E91", -"Q. c #929397", -"(. c #959799", -"XX c #9B999C", -"B c #989B9E", -"s. c #9EA0A3", -"$. c #A7A9AB", -"0 c #ADAEB1", -"A. c #C8C9CA", -"$X c #CECECF", -"q c #D1D2D4", -"wX c #CBD3D7", -"J. c #D7D7D8", -"o. c #DADBDB", -"fo c #50D4F4", -"j c #76797C", -"UX c #5FD6F4", -"Xo c #56D6F5", -"ZX c #7ADCF4", -"lX c #56D9FA", -"|X c #98E6F8", -"=o c #92E4F8", -"AX c #D4EEF5", -"CX c #86E3FA", -"Oo c #AAE9F9", -"Go c #B3ECFA", -"#. c #F5F6F6", -"m c #828688", -"]X c #B0EBFB", -"oX c #85878A", -"Po c #CEF2FC", -") c #85878B", -"! c #FBFBFB", -"co c #D1F3FD", -"JX c #D1F6FE", -"KX c #F8FDFE", -"}. c #8B8C8F", -"Ao c #F8FDFF", -"%. c #8B8C90", -"I c #8E9092", -"b. c #8E9094", -"U c #97999B", -"9. c #97999C", -"e. c #97999D", -"6 c #A3A6A9", -"3 c #BBBDBE", -"9 c #C1C2C4", -"p. c #CACBCC", -"- c #D9D9DA", -"8. c #DFDEE0", -"9o c #31CBF2", -"SX c #46D2F5", -"mo c #5ED7F4", -"~. c #EBEBEB", -"$o c #64D9F5", -"5. c #EBEBEC", -"2o c #88E2F7", -"1X c #DFEDF1", -"k. c #818486", -"< c #F4F4F5", -"Ko c #C7F1FB", -"@ c #F7F8F8", -"Vo c #CDF3FC", -"4o c #C7F1FC", -":. c #87898C", -"{. c #8A8A8D", -"-X c #EEFBFE", -"ro c #E8F9FE", -"x c #909295", -"7. c #909296", -"*. c #939698", -",X c #8A9398", -"u. c #96979B", -"n. c #999B9E", -"@. c #9FA0A3", -"h. c #A2A4A6", -"L. c #B1B2B5", -"~ c #B4B6B8", -"%X c #BDBFC1", -"N. c #CCCDCE", -"7X c #CCD0D2", -"T. c #DBDBDD", -"X. c #E4E4E4", -"l c #E4E4E6", -"so c #33CDF3", -"E c #E7E8E8", -"w c #E7E8E9", -"xX c #C0E1EB", -"No c #48D1F4", -"T c #EAE9EA", -"zo c #45D0F4", -"kX c #4ED6F6", -"g c #EDEDED", -"1. c #EDEDEE", -"b c #EDEDEF", -";o c #78DEF7", -"}X c #8DE2F7", -"3o c #93E4F8", -"&X c #808286", -"{X c #B1EBF9", -"G. c #838688", -"io c #B7EDFA", -",o c #B7EDFB", -"DX c #C9F3FC", -"& c #F9FAFA", -"fX c #C6F8FF", -"Zo c #D8F5FD", -"S c #898B8E", -": c #FFFFFE", -"bo c #F9FDFF", -"O c #FFFFFF", -"G c #8C8F92", -"E. c #929498", -"{ c #A1A2A5", -"q. c #AAABAE", -" , < ", -"1 2 3 4 O O + 5 6 7 8 O O . 9 0 q w e r t O y u i p ", -"a s d f O O g h j k l O O z x c v b n m M O N B V C ", -"Z A S D O O F G H J K L O P I U Y O T a R O O E W Q ", -"! ~ ^ / O O ( ) _ ` ' & O ] [ { + 8 } | .O ..X.o.4 ", -"O O.+.@.#.X $.%.&.*.=.-.: ;.:.M O >.,.[ <.O 1.2.3.4. ", -"O 5.6.7.8.z e 9.0.q.` w.N e.r.t.O y.u.i.p.O a.s.d.f. ", -"O g.h.:.j.a k.l.+ z.x.c.v.b.n.m.O z M.:.N.O B.V.C.Z. ", -"O $ A.S.D.F.G.H.O J.K.L.P.I.U.$ O Y.M.:.N.O B.V.C.Z. ", -"O O T.R.E.W.Q.!.O ~.^./.(.)._.+ O z M.:.N.O B.V.C.Z. ", -"O O z `.I.:.'.Y.O ].[.{.}.|. XO O .XXXoXOXO +X@X#X$X ", -"O O 8 %X&X*X=XO -X;X:X>X,Xo,oO QX c #E5E5E5", +", c #D9D9DA", +"' c #F5F5F5", +") c #FFFFFE", +"! c #E4E5E5", +"~ c #D6D6D8", +"{ c #F4F4F5", +"] c #DDDEDF", +"^ c #ABABAD", +"/ c #BBBDBE", +"( c #F0F0F0", +"_ c #D3D3D5", +": c #A3A6A9", +"< c #C7C9CA", +"[ c #FAFAFA", +"} c #C1C2C4", +"| c #ADAEB1", +"1 c #D1D2D4", +"2 c #E7E8E9", +"3 c #919396", +"4 c #7E8184", +"5 c #C0C2C4", +"6 c #E7E7E9", +"7 c #96989A", +"8 c #76777B", +"9 c #CACACC", +"0 c #DDDDDE", +"a c #808184", +"b c #8C8E91", +"c c #DBDDDC", +"d c #EDEDED", +"e c #9E9FA2", +"f c #76797C", +"g c #8F9195", +"h c #E4E4E6", +"i c #EEEEEF", +"j c #909295", +"k c #828488", +"l c #C9CACB", +"m c #EDEDEF", +"n c #95969A", +"o c #828688", +"p c #C2C3C4", +"q c #E8E8E9", +"r c #989B9E", +"s c #7B7D81", +"t c #CCCCCE", +"u c #F2F3F3", +"v c #9FA1A3", +"w c #898B8E", +"x c #C3C5C5", +"y c #D6D7D9", +"z c #8C8F92", +"A c #88898C", +"B c #86888C", +"C c #CECFD1", +"D c #FFFEFE", +"E c #D5D5D6", +"F c #8E9092", +"G c #97999B", +"H c #ECECED", +"I c #EAE9EA", +"J c #F7F7F7", +"K c #E7E8E8", +"L c #DCDCDD", +"M c #F7F7F8", +"N c #FBFBFB", +"O c #B4B6B8", +"P c #838589", +"Q c #AEB0B1", +"R c #C6C6C8", +"S c #85878B", +"T c #909396", +"U c #84868A", +"V c #BDBEC0", +"W c #B8BABB", +"X c #8A8C8E", +"Y c #A1A2A5", +"Z c #E0E1E1", +"` c #DBDCDD", +" . c #F1F1F0", +".. c #FAFAF9", +"+. c #E4E4E4", +"@. c #DADBDB", +"#. c #D4D4D5", +"$. c #818387", +"%. c #9FA0A3", +"&. c #F5F6F6", +"*. c #A7A9AB", +"=. c #8B8C90", +"-. c #B9BABC", +";. c #939698", +">. c #9A9C9F", +",. c #EFF0F0", +"'. c #A5A7A9", +"). c #87898C", +"!. c #EFEFEF", +"~. c #9C9DA0", +"{. c #CCCECF", +"]. c #EDEDEE", +"^. c #A3A5A7", +"/. c #85888A", +"(. c #CECFCF", +"_. c #EBEBEC", +":. c #8B8D8F", +"<. c #909296", +"[. c #DFDEE0", +"}. c #97999C", +"|. c #E5E5E6", +"1. c #AAABAE", +"2. c #E1E1E2", +"3. c #97999D", +"4. c #8D8F93", +"5. c #E1E2E3", +"6. c #EEEEEE", +"7. c #96979B", +"8. c #838588", +"9. c #CACBCC", +"0. c #ECEBEC", +"a. c #9EA0A3", +"b. c #7D8084", +"c. c #CBCCCD", +"d. c #F3F3F4", +"e. c #A2A4A6", +"f. c #CFD0D1", +"g. c #818486", +"h. c #B1B3B4", +"i. c #BEBFC1", +"j. c #7C7F82", +"k. c #D1D1D2", +"l. c #DADCDC", +"m. c #8E9094", +"n. c #999B9E", +"o. c #F1F1F2", +"p. c #9A9B9E", +"q. c #CCCDCE", +"r. c #EDECED", +"s. c #A2A3A6", +"t. c #828588", +"u. c #CDCECF", +"v. c #C8C9CA", +"w. c #818388", +"x. c #AEAFB2", +"y. c #B8B8BA", +"z. c #838688", +"A. c #C5C7C8", +"B. c #D7D7D8", +"C. c #85888C", +"D. c #B1B2B5", +"E. c #B5B7B9", +"F. c #888A8D", +"G. c #B4B5B7", +"H. c #EDEEEF", +"I. c #DBDBDD", +"J. c #8A8C8F", +"K. c #929498", +"L. c #909194", +"M. c #929397", +"N. c #DDDDDF", +"O. c #EBEBEB", +"P. c #9C9EA1", +"Q. c #8F9194", +"R. c #959799", +"S. c #888A8E", +"T. c #CECFD2", +"U. c #989A9C", +"V. c #9FA1A4", +"W. c #F9F8F7", +"X. c #AAACAE", +"Y. c #8A8A8D", +"Z. c #8B8C8F", +"`. c #8E8F93", +" + c #EDEBEC", +".+ c #F2EEEF", +"++ c #9B999C", +"@+ c #85878A", +"#+ c #CCCCCD", +"$+ c #F0ECED", +"%+ c #A3A2A4", +"&+ c #7F8184", +"*+ c #CECECF", +"=+ c #BDBFC1", +"-+ c #808286", +";+ c #85888B", +">+ c #BEC0C1", +",+ c #EEFBFE", +"'+ c #F5FDFF", +")+ c #CBCBCD", +"!+ c #84959C", +"~+ c #8A9398", +"{+ c #B3B4B6", +"]+ c #DFEDF1", +"^+ c #F0F6F7", +"/+ c #E2F8FE", +"(+ c #CFE8EF", +"_+ c #899EA7", +":+ c #8A8E92", +"<+ c #CCD0D2", +"[+ c #E9FAFF", +"}+ c #D4E7ED", +"|+ c #8FA6AD", +"1+ c #848C92", +"2+ c #CBD3D7", +"3+ c #E3F8FD", +"4+ c #DFF7FD", +"5+ c #E7F9FD", +"6+ c #F2F3F4", +"7+ c #B9B9BD", +"8+ c #BDBDC0", +"9+ c #F1F2F3", +"0+ c #80E0F8", +"a+ c #9EE6F8", +"b+ c #5FDEFD", +"c+ c #C6F8FF", +"d+ c #D7FCFF", +"e+ c #71CBE2", +"f+ c #A5CBD6", +"g+ c #4ED6F6", +"h+ c #56D9FA", +"i+ c #4FD9FA", +"j+ c #C0E1EB", +"k+ c #CBF6FF", +"l+ c #52D8F9", +"m+ c #56D5F5", +"n+ c #45D5F9", +"o+ c #A7F0FF", +"p+ c #98E8FC", +"q+ c #67D9F6", +"r+ c #58D6F4", +"s+ c #53D4F4", +"t+ c #86E3FA", +"u+ c #7ADCF4", +"v+ c #D4EEF5", +"w+ c #46D2F5", +"x+ c #C9F3FC", +"y+ c #6EDCF7", +"z+ c #AFE5F4", +"A+ c #E7F8FC", +"B+ c #D1F6FE", +"C+ c #F8FDFE", +"D+ c #74DCF7", +"E+ c #B8F0FE", +"F+ c #9DE7FA", +"G+ c #5FD6F4", +"H+ c #B5EDFA", +"I+ c #8BE2F8", +"J+ c #72DDF6", +"K+ c #60D7F5", +"L+ c #EEFAFD", +"M+ c #FDFEFE", +"N+ c #94E4F8", +"O+ c #70DCF8", +"P+ c #72DEF9", +"Q+ c #44CFF2", +"R+ c #99E5F8", +"S+ c #62D8F4", +"T+ c #DEF8FF", +"U+ c #F2FCFF", +"V+ c #CCF2FC", +"W+ c #B0EBFB", +"X+ c #61D7F5", +"Y+ c #B1EBF9", +"Z+ c #8DE2F7", +"`+ c #98E6F8", +" @ c #EFFBFF", +".@ c #9AE7F9", +"+@ c #56D6F5", +"@@ c #A7E9F9", +"#@ c #AAE9F9", +"$@ c #6ADAF6", +"%@ c #98E5F9", +"&@ c #56D5F4", +"*@ c #64D9F5", +"=@ c #54D4F4", +"-@ c #9FE7F8", +";@ c #F8FEFE", +">@ c #92E4F8", +",@ c #70DCF6", +"'@ c #78DEF7", +")@ c #66DAF6", +"!@ c #88E1F7", +"~@ c #B7EDFB", +"{@ c #92E3F8", +"]@ c #57D5F4", +"^@ c #88E2F7", +"/@ c #93E4F8", +"(@ c #C7F1FC", +"_@ c #91E4F8", +":@ c #38CEF3", +"<@ c #7DDFF8", +"[@ c #69DAF6", +"}@ c #31CBF2", +"|@ c #ABEAFA", +"1@ c #8CE3F7", +"2@ c #E2F8FD", +"3@ c #8AE2F8", +"4@ c #E8F9FE", +"5@ c #F3FCFE", +"6@ c #E5F9FD", +"7@ c #6DDBF5", +"8@ c #B7EDFA", +"9@ c #CEF3FC", +"0@ c #79DEF7", +"a@ c #33CDF3", +"b@ c #D1F4FC", +"c@ c #50D4F4", +"d@ c #5CD6F5", +"e@ c #E3F8FE", +"f@ c #59D6F5", +"g@ c #6DDBF6", +"h@ c #9BE6FA", +"i@ c #45D0F4", +"j@ c #95E4F8", +"k@ c #D1F3FD", +"l@ c #6AD9F5", +"m@ c #F9FDFF", +"n@ c #D8F6FD", +"o@ c #5ED7F4", +"p@ c #C0EFFB", +"q@ c #48D1F4", +"r@ c #AAEAFA", +"s@ c #CDF3FC", +"t@ c #BFEFFB", +"u@ c #D8F5FD", +"v@ c #F8FDFF", +"w@ c #C5F1FB", +"x@ c #B5ECFB", +"y@ c #BEEFFB", +"z@ c #B3ECFA", +"A@ c #DCF6FD", +"B@ c #F0FBFE", +"C@ c #C7F1FB", +"D@ c #C3F0FC", +"E@ c #CEF2FC", +"F@ c #ECFBFE", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . + @ # . . . . $ % & . . . . * = - ; > , ' . ) ! ~ { . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . ] ^ / ( . . $ _ : < [ . . + } | 1 2 3 4 5 . 6 7 8 9 . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . 0 a b c . . d e f g h . . i j k l m n o p . q r s t . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . u v w x . . y z A B C D . E F G H . I 0 J . . K L M . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . N O P Q . . R S T U V - . W X Y $ [ Z ` .. ..+.@.( . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . #.$.%.&.@ *.=.-.;.>.,.) '.).p . !.~.X {.. ].^./.(.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . _.:.<.[.i 3 }.|.1.U 2.q 3.4.5.. 6.7.8.9.. 0.a.b.c.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . d.e.).f.0 g.h.$ i.j.k.l.m.n.o.. i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . * v.w.x.y.z.A.. B.C.D.E.F.G.* . H.p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . I.J.K.L.M.N.. O.P.Q.R.S.T.$ . i p.).q.. r.s.t.u.. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . i U.F.).V.H.. W.X.Y.Z.`. +. . .+++@+#+. $+%+&+*+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . [ =+-+;+>+. ,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . 6+7+8+9+. 0+a+. b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+q+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+. @.@+@@@#@$@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . %@s+&@*@=@-@;@>@,@'@)@V+!@~@. M+{@]@^@/@(@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . _@:@<@[@}@3+|@1@2@W+3@4@3@5@. 6@7@8@. 9@4+. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . 0@a@b@c@d@e@f@g@h@i@j@k@l@m@. n@o@/@p@q@r@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . s@t@. (@u@v@w@x@y@z@A@B@C@v@. B@(@D@E@p@F@. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "}; diff --git a/Source/Core/DolphinWX/resources/Platform_Wii.xpm b/Source/Core/DolphinWX/resources/Platform_Wii.xpm index eb163b80f0..c9781b427f 100644 --- a/Source/Core/DolphinWX/resources/Platform_Wii.xpm +++ b/Source/Core/DolphinWX/resources/Platform_Wii.xpm @@ -1,195 +1,192 @@ /* XPM */ -static const char *Platform_Wii_xpm[] = { -/* columns rows colors chars-per-pixel */ -"96 32 187 2", -":. c #C5C6C8", -"V c #D4D5D6", -"k c #E3E4E4", -"w. c #CACACC", -"5. c #E8E8E9", -"5 c #F7F7F8", -"8 c #8C8E91", -".X c #AAACAF", -"+. c #AFB0B2", -"= c #DCDDDE", -"L. c #EBECED", -"H c #FAFBFB", -"%. c #F0F0F0", -"J. c #F0F0F1", -"+ c #FFFFFF", -"O. c #808386", -"U. c #8F9294", -"0. c #85878A", -"S. c #949698", -"K. c #949699", -"2. c #B2B4B6", -"!. c #A8A9AC", -"z. c #B7B8BA", -"S c #C6C7C8", -"7. c #D5D6D7", -"P c #F3F4F4", -") c #E9E9E9", -"m. c #E9E9EB", -"% c #F8F8F8", -"n. c #F8F8F9", -"p. c #888B8D", -"h c #7E8084", -"n c #8D8F92", -"k. c #9C9EA0", -"8. c #8D8F93", -"u c #BABCBE", -"} c #E2E2E2", -"N c #E2E2E3", -"( c #F1F1F1", -">. c #818487", -"x. c #818488", -"K c #86888B", -"A. c #959799", -"<. c #86888C", -"r. c #95979A", -"j. c #8B8C8F", -"v c #B3B5B7", -"9. c #A9AAAD", -", c #C7C8C9", -"* c #E5E6E7", -"*. c #F9F9F9", -"Q. c #7F8184", -",. c #8E9092", -"B c #8E9093", -"U c #9D9FA3", -"R. c #A2A3A6", -"[ c #CFD0D0", -"e c #C0C1C3", -"d c #EDEEEE", -"(. c #FCFDFD", -"b c #87898C", -"/ c #96989A", -"^ c #87898D", -"t c #96989B", -"L c #A5A7A9", -"- c #E6E7E8", -"X c #DCDCDD", -"]. c #FAFAFA", -"e. c #8A8D90", -"N. c #8F9194", -"d. c #9EA0A3", -"{. c #9EA0A4", -"=. c #A3A4A7", -" X c #A3A4A8", -"s. c #CBCDCE", -"| c #C1C2C3", -"o c #DFE0E0", -"Z c #C6C6C8", -" c None", -"|. c #D5D5D7", -"R c #E4E4E5", -"XX c #F3F3F3", -"! c #F3F3F4", -"O c #F8F7F7", -"#. c #838689", -"' c #888A8D", -"x c #888A8E", -"Q c #97999C", -";. c #A6A8AA", -"c c #C4C6C6", -"@. c #C4C6C7", -"b. c #BABBBD", -"4. c #C9CACB", -"P. c #C9CACC", -"1. c #BFBFC2", -"; c #F6F7F7", -"r c #ECECED", -"f c #FBFBFB", -"T. c #FBFBFC", -"p c #909296", -"7 c #86878A", -"{ c #BDBFC0", -"] c #A4A5A8", -"_ c #D1D2D4", -"D c #E0E1E1", -"~. c #C7C7C9", -"Y. c #EFF0F0", -"I c #F4F4F4", -"f. c #F4F4F5", -"w c #84878A", -"s c #939699", -"W c #898B8E", -"6. c #898B8F", -"B. c #989A9D", -"g. c #989A9E", -"` c #A7A9AB", -"^. c #8E8F93", -" . c #C5C7C7", -"E. c #ACADAF", -"[. c #BBBCBF", -"c. c #C0C0C2", -"6 c #D9DADB", -"0 c #DEDEDF", -". c #EDEDEE", -"@ c #FCFCFC", -"a c #7D8083", -"j c #828487", -"F c #9B9EA1", -"z c #96979A", -"`. c #A5A6A8", -"W. c #A5A6A9", -"y. c #B4B5B7", -"Z. c #D2D3D4", -"2 c #E1E2E2", -"h. c #C8C8CA", -"# c #E1E2E3", -"l. c #F0F1F2", -"). c #E6E6E7", -"M c #F5F5F6", -"Y c #8A8C8F", -"X. c #8A8C90", -"3 c #999B9D", -"A c #999B9E", -"q. c #ADAEB0", -"&. c #CBCCCD", -"G. c #CBCCCE", -"$ c #DADBDC", -"/. c #F8F9F9", -"l c #EEEEEE", -"'. c #EEEEEF", -"< c #FDFDFD", -"C c #FDFDFE", -"3. c #7E8184", -"u. c #838588", -"M. c #929496", -"y c #838589", -"H. c #929497", -"V. c #88898C", -"i. c #B0B2B3", -"J c #B0B2B4", -"> c #97989B", -"C. c #B5B6B9", -"~ c #C4C5C6", -"9 c #D3D4D4", -"4 c #ABABAF", -"D. c #D3D4D6", -".. c #E7E7E7", -"G c #F6F6F7", -"-. c #7C7E81", -"o. c #8B8D90", -"a. c #9A9C9E", -"q c #8B8D91", -"m c #9A9C9F", -"$. c #A9ABAD", -"v. c #A9ABAE", -"E c #BDBEBF", -"g c #AEAFB2", -"}. c #BDBEC1", -"t. c #EAEBEB", -"i c #EFEFF0", -"& c #FEFEFE", -"1 c #FEFEFF", -"I. c #848689", -"T c #8E9195", -"F. c #A2A4A6", -"_. c #A2A4A7", -": c #C5C6C7", -/* pixels */ +static const char * Platform_Wii_xpm[] = { +"96 32 186 2", +" c #FFFFFF", +". c #EDEDEE", +"+ c #DCDCDD", +"@ c #DFE0E0", +"# c #F8F7F7", +"$ c #FCFCFC", +"% c #E1E2E3", +"& c #DADBDC", +"* c #F8F8F8", +"= c #FEFEFE", +"- c #E5E6E7", +"; c #DCDDDE", +"> c #E6E7E8", +", c #F6F7F7", +"' c #C5C6C7", +") c #97989B", +"! c #C7C8C9", +"~ c #FDFDFD", +"{ c #FEFEFF", +"] c #E1E2E2", +"^ c #999B9D", +"/ c #ABABAF", +"( c #F7F7F8", +"_ c #D9DADB", +": c #86878A", +"< c #8C8E91", +"[ c #D3D4D4", +"} c #DEDEDF", +"| c #8B8D91", +"1 c #84878A", +"2 c #C0C1C3", +"3 c #ECECED", +"4 c #96989B", +"5 c #838589", +"6 c #BABCBE", +"7 c #EFEFF0", +"8 c #909296", +"9 c #7D8083", +"0 c #939699", +"a c #EDEEEE", +"b c #FBFBFB", +"c c #AEAFB2", +"d c #7E8084", +"e c #828487", +"f c #E3E4E4", +"g c #EEEEEE", +"h c #96979A", +"i c #888A8E", +"j c #C4C6C6", +"k c #B3B5B7", +"l c #87898C", +"m c #8D8F92", +"n c #9A9C9F", +"o c #F5F5F6", +"p c #E2E2E3", +"q c #8E9093", +"r c #D4D5D6", +"s c #FDFDFE", +"t c #C6C6C8", +"u c #999B9E", +"v c #C6C7C8", +"w c #E0E1E1", +"x c #9B9EA1", +"y c #F6F6F7", +"z c #FAFBFB", +"A c #B0B2B4", +"B c #86888B", +"C c #A5A7A9", +"D c #F3F4F4", +"E c #F4F4F4", +"F c #9D9FA3", +"G c #8A8C8F", +"H c #8E9195", +"I c #E4E4E5", +"J c #BDBEBF", +"K c #898B8E", +"L c #97999C", +"M c #F3F3F4", +"N c #C4C5C6", +"O c #87898D", +"P c #96989A", +"Q c #F1F1F1", +"R c #E9E9E9", +"S c #D1D2D4", +"T c #A7A9AB", +"U c #888A8D", +"V c #A4A5A8", +"W c #CFD0D0", +"X c #BDBFC0", +"Y c #E2E2E2", +"Z c #C1C2C3", +"` c #C5C7C7", +" . c #E7E7E7", +".. c #8A8C90", +"+. c #8B8D90", +"@. c #808386", +"#. c #AFB0B2", +"$. c #C4C6C7", +"%. c #838689", +"&. c #A9ABAD", +"*. c #F0F0F0", +"=. c #CBCCCD", +"-. c #F9F9F9", +";. c #A3A4A7", +">. c #7C7E81", +",. c #A6A8AA", +"'. c #C5C6C8", +"). c #818487", +"!. c #8E9092", +"~. c #86888C", +"{. c #BFBFC2", +"]. c #B2B4B6", +"^. c #7E8184", +"/. c #C9CACB", +"(. c #E8E8E9", +"_. c #898B8F", +":. c #D5D6D7", +"<. c #8D8F93", +"[. c #A9AAAD", +"}. c #85878A", +"|. c #ADAEB0", +"1. c #CACACC", +"2. c #8A8D90", +"3. c #95979A", +"4. c #EAEBEB", +"5. c #B4B5B7", +"6. c #838588", +"7. c #B0B2B3", +"8. c #888B8D", +"9. c #9A9C9E", +"0. c #CBCDCE", +"a. c #9EA0A3", +"b. c #F4F4F5", +"c. c #989A9E", +"d. c #C8C8CA", +"e. c #8B8C8F", +"f. c #9C9EA0", +"g. c #F0F1F2", +"h. c #B7B8BA", +"i. c #818488", +"j. c #C0C0C2", +"k. c #A9ABAE", +"l. c #BABBBD", +"m. c #F8F8F9", +"n. c #E9E9EB", +"o. c #929496", +"p. c #8F9194", +"q. c #989A9D", +"r. c #88898C", +"s. c #B5B6B9", +"t. c #D2D3D4", +"u. c #959799", +"v. c #949698", +"w. c #D3D4D6", +"x. c #A2A4A6", +"y. c #CBCCCE", +"z. c #929497", +"A. c #F0F0F1", +"B. c #949699", +"C. c #EBECED", +"D. c #C9CACC", +"E. c #848689", +"F. c #8F9294", +"G. c #EFF0F0", +"H. c #FBFBFC", +"I. c #A2A3A6", +"J. c #ACADAF", +"K. c #A5A6A9", +"L. c #7F8184", +"M. c #A8A9AC", +"N. c #C7C7C9", +"O. c #8E8F93", +"P. c #F8F9F9", +"Q. c #FCFDFD", +"R. c #E6E6E7", +"S. c #A2A4A7", +"T. c #A5A6A8", +"U. c #EEEEEF", +"V. c #FAFAFA", +"W. c #BBBCBF", +"X. c #9EA0A4", +"Y. c #BDBEC1", +"Z. c #D5D5D7", +"`. c #A3A4A8", +" + c #AAACAF", +".+ c #F3F3F3", " ", " ", " ", @@ -199,19 +196,20 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -". X o O + + + @ # $ % + + + & * = - ; : > , < 1 2 3 4 5 ", -"6 7 8 9 + + + 0 q w e + + + r t y u i p a s d f g h j k ", -"l z x c < + f v b n m M + + N 8 B V C Z A S @ & D F g G ", -"H J K L P + I U Y B T R + < E W Q ! + f I f + + & I % + ", -"+ ~ ^ / ( + ) q s A b _ < & ` ' ] & @ [ { 9 + + } | .P ", -"+ ..X.o.$ + , O.+.@.#.$.< %.z ' &.& *.=.-.;.+ + :.>.,.) ", -"+ 5 3 <.1.f 2.3.4.5.6.t ( 7.8.p - + *.9.0.q.+ + w.e.r.t. ", -"+ f y.u.i.( 3 p.5.G a.<.R s.<.d.f.+ *.9.0.q.+ + w.e.r.t. ", -"+ & $ <.g.h.j.k.l.@ z.x.c.v.K b.& + n.9.0.q.+ + w.e.r.t. ", -"+ + m.M.N.B.V.C.< + Z.o.A.S.6.D.+ + *.9.0.q.+ + w.e.r.t. ", -"+ + f F.Y N.' G.+ + k H.n B p J.+ + *.9.0.q.+ + w.e.K.L. ", -"+ + + P.I.x U.Y.+ + T.R.<.K E.n.+ + n.W.Q.!.+ + ~.w ^.i ", -"+ + + /.C.m Z.(.+ + + )._.`.'.+ + + ].[.{.}.+ + |. X.XXX ", +" ", +" . + @ # $ % & * = - ; > , ' ) ! ~ { ] ^ / ( ", +" _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d e f ", +" g h i j ~ b k l m n o p < q r s t u v $ = w x c y ", +" z A B C D E F G q H I ~ J K L M b E b = E * ", +" N O P Q R | 0 u l S ~ = T U V = $ W X [ Y Z ` D ", +" ...+.& ! @.#.$.%.&.~ *.h U =.= -.;.>.,. '.).!.R ", +" ( ^ ~.{.b ].^./.(._.4 Q :.<.8 > -.[.}.|. 1.2.3.4. ", +" b 5.6.7.Q ^ 8.(.y 9.~.I 0.~.a.b. -.[.}.|. 1.2.3.4. ", +" = & ~.c.d.e.f.g.$ h.i.j.k.B l.= m.[.}.|. 1.2.3.4. ", +" n.o.p.q.r.s.~ t.+.u.v._.w. -.[.}.|. 1.2.3.4. ", +" b x.G p.U y. f z.m q 8 A. -.[.}.|. 1.2.B.C. ", +" D.E.i F.G. H.I.~.B J.m. m.K.L.M. N.1 O.7 ", +" P.s.n t.Q. R.S.T.U. V.W.X.Y. Z.`. +.+ ", " ", " ", " ", @@ -220,6 +218,4 @@ static const char *Platform_Wii_xpm[] = { " ", " ", " ", -" ", -" " -}; +" "}; From 346922e39ea6d2e06c0dca0cbfa6180113604afe Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Fri, 11 Jan 2013 15:13:20 -0600 Subject: [PATCH 11/17] Update game cache revision, for "germany" games that were once "europe". --- Source/Core/DolphinWX/Src/ISOFile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 104f5a46997a18d90f6adafd5ad2a0d2116d5b32 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Fri, 11 Jan 2013 17:53:34 -0500 Subject: [PATCH 12/17] Set focus on game list after stopping emulation. --- Source/Core/DolphinWX/Src/FrameTools.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/FrameTools.cpp b/Source/Core/DolphinWX/Src/FrameTools.cpp index b79e890f3b..d4cf35b121 100644 --- a/Source/Core/DolphinWX/Src/FrameTools.cpp +++ b/Source/Core/DolphinWX/Src/FrameTools.cpp @@ -1177,6 +1177,7 @@ void CFrame::DoStop() m_GameListCtrl->Enable(); m_GameListCtrl->Show(); + m_GameListCtrl->SetFocus(); UpdateGUI(); } } From dfc0c4b08d339502989fdfaf21e89f8ed77366a3 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 11 Jan 2013 19:38:04 -0500 Subject: [PATCH 13/17] Fix two signed/unsigned mismatch warnings. Also tidied up SDCardUtil - made the variables make more sense (typewise) --- Source/Core/Common/Src/SDCardUtil.cpp | 98 +++++++++---------- .../Core/VideoCommon/Src/PixelShaderGen.cpp | 6 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Source/Core/Common/Src/SDCardUtil.cpp b/Source/Core/Common/Src/SDCardUtil.cpp index 4002a51b99..0f2ad08607 100644 --- a/Source/Core/Common/Src/SDCardUtil.cpp +++ b/Source/Core/Common/Src/SDCardUtil.cpp @@ -40,7 +40,7 @@ #include // for unlink() #endif -/* believe me, you *don't* want to change these constants !! */ +/* Believe me, you *don't* want to change these constants !! */ #define BYTES_PER_SECTOR 512 #define RESERVED_SECTORS 32 #define BACKUP_BOOT_SECTOR 6 @@ -52,15 +52,15 @@ #define POKES(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8) ) #define POKEW(p,v) ( BYTE_(p,0) = (u8)(v), BYTE_(p,1) = (u8)((v) >> 8), BYTE_(p,2) = (u8)((v) >> 16), BYTE_(p,3) = (u8)((v) >> 24) ) -static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* boot sector */ +static u8 s_boot_sector [ BYTES_PER_SECTOR ]; /* Boot sector */ static u8 s_fsinfo_sector [ BYTES_PER_SECTOR ]; /* FS Info sector */ -static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* first FAT sector */ +static u8 s_fat_head [ BYTES_PER_SECTOR ]; /* First FAT sector */ -/* this is the date and time when creating the disk */ -static int get_serial_id() +/* This is the date and time when creating the disk */ +static unsigned int get_serial_id() { u16 lo, hi; - time_t now = time(NULL); + time_t now = time(nullptr); struct tm tm = gmtime( &now )[0]; lo = (u16)(tm.tm_mday + ((tm.tm_mon+1) << 8) + (tm.tm_sec << 8)); @@ -69,7 +69,7 @@ static int get_serial_id() return lo + (hi << 16); } -static int get_sectors_per_cluster(u64 disk_size) +static unsigned int get_sectors_per_cluster(u64 disk_size) { u64 disk_MB = disk_size/(1024*1024); @@ -88,60 +88,60 @@ static int get_sectors_per_cluster(u64 disk_size) return 32; } -static int get_sectors_per_fat(u64 disk_size, int sectors_per_cluster) +static unsigned int get_sectors_per_fat(u64 disk_size, u32 sectors_per_cluster) { u64 divider; - /* weird computation from MS - see fatgen103.doc for details */ - disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* don't count 32 reserved sectors */ - disk_size /= BYTES_PER_SECTOR; /* disk size in sectors */ + /* Weird computation from MS - see fatgen103.doc for details */ + disk_size -= RESERVED_SECTORS * BYTES_PER_SECTOR; /* Don't count 32 reserved sectors */ + disk_size /= BYTES_PER_SECTOR; /* Disk size in sectors */ divider = ((256 * sectors_per_cluster) + NUM_FATS) / 2; - return (int)( (disk_size + (divider-1)) / divider ); + return (u32)( (disk_size + (divider-1)) / divider ); } static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* label) { - int sectors_per_cluster = get_sectors_per_cluster(disk_size); - int sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); - int sectors_per_disk = (int)(disk_size / BYTES_PER_SECTOR); - int serial_id = get_serial_id(); - int free_count; + u32 sectors_per_cluster = get_sectors_per_cluster(disk_size); + u32 sectors_per_fat = get_sectors_per_fat(disk_size, sectors_per_cluster); + u32 sectors_per_disk = (u32)(disk_size / BYTES_PER_SECTOR); + u32 serial_id = get_serial_id(); + u32 free_count; - if (label == NULL) + if (label == nullptr) label = "DOLPHINSD"; POKEB(boot, 0xeb); POKEB(boot+1, 0x5a); POKEB(boot+2, 0x90); strcpy( (char*)boot + 3, "MSWIN4.1" ); - POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* sector size */ - POKEB( boot + 0xd, sectors_per_cluster ); /* sectors per cluster */ - POKES( boot + 0xe, RESERVED_SECTORS ); /* reserved sectors before first FAT */ - POKEB( boot + 0x10, NUM_FATS ); /* number of FATs */ - POKES( boot + 0x11, 0 ); /* max root directory entries for FAT12/FAT16, 0 for FAT32 */ - POKES( boot + 0x13, 0 ); /* total sectors, 0 to use 32-bit value at offset 0x20 */ - POKEB( boot + 0x15, 0xF8 ); /* media descriptor, 0xF8 == hard disk */ + POKES( boot + 0x0b, BYTES_PER_SECTOR ); /* Sector size */ + POKEB( boot + 0xd, sectors_per_cluster ); /* Sectors per cluster */ + POKES( boot + 0xe, RESERVED_SECTORS ); /* Reserved sectors before first FAT */ + POKEB( boot + 0x10, NUM_FATS ); /* Number of FATs */ + POKES( boot + 0x11, 0 ); /* Max root directory entries for FAT12/FAT16, 0 for FAT32 */ + POKES( boot + 0x13, 0 ); /* Total sectors, 0 to use 32-bit value at offset 0x20 */ + POKEB( boot + 0x15, 0xF8 ); /* Media descriptor, 0xF8 == hard disk */ POKES( boot + 0x16, 0 ); /* Sectors per FAT for FAT12/16, 0 for FAT32 */ POKES( boot + 0x18, 9 ); /* Sectors per track (whatever) */ POKES( boot + 0x1a, 2 ); /* Number of heads (whatever) */ POKEW( boot + 0x1c, 0 ); /* Hidden sectors */ POKEW( boot + 0x20, sectors_per_disk ); /* Total sectors */ - /* extension */ + /* Extension */ POKEW( boot + 0x24, sectors_per_fat ); /* Sectors per FAT */ POKES( boot + 0x28, 0 ); /* FAT flags */ - POKES( boot + 0x2a, 0 ); /* version */ - POKEW( boot + 0x2c, 2 ); /* cluster number of root directory start */ - POKES( boot + 0x30, 1 ); /* sector number of FS information sector */ - POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* sector number of a copy of this boot sector */ - POKEB( boot + 0x40, 0x80 ); /* physical drive number */ - POKEB( boot + 0x42, 0x29 ); /* extended boot signature ?? */ - POKEW( boot + 0x43, serial_id ); /* serial ID */ + POKES( boot + 0x2a, 0 ); /* Version */ + POKEW( boot + 0x2c, 2 ); /* Cluster number of root directory start */ + POKES( boot + 0x30, 1 ); /* Sector number of FS information sector */ + POKES( boot + 0x32, BACKUP_BOOT_SECTOR ); /* Sector number of a copy of this boot sector */ + POKEB( boot + 0x40, 0x80 ); /* Physical drive number */ + POKEB( boot + 0x42, 0x29 ); /* Extended boot signature ?? */ + POKEW( boot + 0x43, serial_id ); /* Serial ID */ strncpy( (char*)boot + 0x47, label, 11 ); /* Volume Label */ memcpy( boot + 0x52, "FAT32 ", 8 ); /* FAT system type, padded with 0x20 */ - POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* boot sector signature */ + POKEB( boot + BYTES_PER_SECTOR-2, 0x55 ); /* Boot sector signature */ POKEB( boot + BYTES_PER_SECTOR-1, 0xAA ); /* FSInfo sector */ @@ -149,25 +149,25 @@ static void boot_sector_init(u8* boot, u8* info, u64 disk_size, const char* labe POKEW( info + 0, 0x41615252 ); POKEW( info + 484, 0x61417272 ); - POKEW( info + 488, free_count ); /* number of free clusters */ - POKEW( info + 492, 3 ); /* next free clusters, 0-1 reserved, 2 is used for the root dir */ + POKEW( info + 488, free_count ); /* Number of free clusters */ + POKEW( info + 492, 3 ); /* Next free clusters, 0-1 reserved, 2 is used for the root dir */ POKEW( info + 508, 0xAA550000 ); } static void fat_init(u8* fat) { - POKEW( fat, 0x0ffffff8 ); /* reserve cluster 1, media id in low byte */ - POKEW( fat + 4, 0x0fffffff ); /* reserve cluster 2 */ - POKEW( fat + 8, 0x0fffffff ); /* end of clust chain for root dir */ + POKEW( fat, 0x0ffffff8 ); /* Reserve cluster 1, media id in low byte */ + POKEW( fat + 4, 0x0fffffff ); /* Reserve cluster 2 */ + POKEW( fat + 8, 0x0fffffff ); /* End of cluster chain for root dir */ } -static int write_sector(FILE* file, u8* sector) +static unsigned int write_sector(FILE* file, u8* sector) { return fwrite(sector, 1, 512, file) != 512; } -static int write_empty(FILE* file, u64 count) +static unsigned int write_empty(FILE* file, u64 count) { static u8 empty[64*1024]; @@ -188,8 +188,8 @@ static int write_empty(FILE* file, u64 count) bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) { - int sectors_per_fat; - int sectors_per_disk; + u32 sectors_per_fat; + u32 sectors_per_disk; FILE* f; // Convert MB to bytes @@ -200,21 +200,21 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return false; } - // pretty unlikely to overflow. - sectors_per_disk = (int)(disk_size / 512); + // Pretty unlikely to overflow. + sectors_per_disk = (u32)(disk_size / 512); sectors_per_fat = get_sectors_per_fat(disk_size, get_sectors_per_cluster(disk_size)); - boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, NULL ); + boot_sector_init(s_boot_sector, s_fsinfo_sector, disk_size, nullptr); fat_init(s_fat_head); f = fopen(filename, "wb"); if (!f) { - ERROR_LOG(COMMON, "could not create file '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not create file '%s', aborting...\n", filename); return false; } - /* here's the layout: + /* Here's the layout: * * boot_sector * fsinfo_sector @@ -251,7 +251,7 @@ bool SDCardCreate(u64 disk_size /*in MB*/, const char* filename) return true; FailWrite: - ERROR_LOG(COMMON, "could not write to '%s', aborting...\n", filename); + ERROR_LOG(COMMON, "Could not write to '%s', aborting...\n", filename); if (unlink(filename) < 0) ERROR_LOG(COMMON, "unlink(%s) failed\n%s", filename, GetLastErrorMsg()); fclose(f); diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index f10fd437a8..e21efa5ce1 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -28,7 +28,7 @@ #include "NativeVertexFormat.h" -static void StageHash(int stage, u32* out) +static void StageHash(u32 stage, u32* out) { out[0] |= bpmem.combiners[stage].colorC.hex & 0xFFFFFF; // 24 u32 alphaC = bpmem.combiners[stage].alphaC.hex & 0xFFFFF0; // 24, strip out tswap and rswap for now @@ -141,7 +141,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] @@ -204,7 +204,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.tevindref.hex; // 31 - for (int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times { *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i From dcc216a02728fc258a0b9fb1a8d6f779c8680aba Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 11 Jan 2013 22:22:55 -0500 Subject: [PATCH 14/17] 'count' parameter for AddStereoSamples and AddStereoSamplesBE in WaveFile should be unsigned. Doesn't make sense to have them signed. --- Source/Core/AudioCommon/Src/WaveFile.cpp | 31 +++++++++++++++++------- Source/Core/AudioCommon/Src/WaveFile.h | 4 +-- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Source/Core/AudioCommon/Src/WaveFile.cpp b/Source/Core/AudioCommon/Src/WaveFile.cpp index 802f3f7417..d98348b8bf 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.cpp +++ b/Source/Core/AudioCommon/Src/WaveFile.cpp @@ -100,39 +100,52 @@ void WaveFileWriter::Write4(const char *ptr) file.WriteBytes(ptr, 4); } -void WaveFileWriter::AddStereoSamples(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamples(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); - if (skip_silence) { + + if (skip_silence) + { bool all_zero = true; - for (int i = 0; i < count * 2; i++) - if (sample_data[i]) all_zero = false; - if (all_zero) return; + + for (u32 i = 0; i < count * 2; i++) + { + if (sample_data[i]) + all_zero = false; + } + + if (all_zero) + return; } + file.WriteBytes(sample_data, count * 4); audio_size += count * 4; } -void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, int count) +void WaveFileWriter::AddStereoSamplesBE(const short *sample_data, u32 count) { if (!file) PanicAlertT("WaveFileWriter - file not open."); if (count > BUF_SIZE * 2) - PanicAlert("WaveFileWriter - buffer too small (count = %i).", count); + PanicAlert("WaveFileWriter - buffer too small (count = %u).", count); if (skip_silence) { bool all_zero = true; - for (int i = 0; i < count * 2; i++) + + for (u32 i = 0; i < count * 2; i++) + { if (sample_data[i]) all_zero = false; + } + if (all_zero) return; } - for (int i = 0; i < count * 2; i++) + for (u32 i = 0; i < count * 2; i++) conv_buffer[i] = Common::swap16((u16)sample_data[i]); file.WriteBytes(conv_buffer, count * 4); diff --git a/Source/Core/AudioCommon/Src/WaveFile.h b/Source/Core/AudioCommon/Src/WaveFile.h index 72a090814b..11fbb4ced5 100644 --- a/Source/Core/AudioCommon/Src/WaveFile.h +++ b/Source/Core/AudioCommon/Src/WaveFile.h @@ -50,8 +50,8 @@ public: void SetSkipSilence(bool skip) { skip_silence = skip; } - void AddStereoSamples(const short *sample_data, int count); - void AddStereoSamplesBE(const short *sample_data, int count); // big endian + void AddStereoSamples(const short *sample_data, u32 count); + void AddStereoSamplesBE(const short *sample_data, u32 count); // big endian u32 GetAudioSize() { return audio_size; } }; From 2cd415dd837d24e384524a7f0b39d547f890535f Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Fri, 11 Jan 2013 22:00:36 -0600 Subject: [PATCH 15/17] Fix the signed/unsigned comparison warnings created by a recent commit. --- Source/Core/VideoCommon/Src/PixelShaderGen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp index e21efa5ce1..c1ebdbcc89 100644 --- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp @@ -141,7 +141,7 @@ void GetPixelShaderId(PIXELSHADERUID *uid, DSTALPHA_MODE dstAlphaMode, u32 compo } u32* ptr = &uid->values[2]; - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) { StageHash(i, ptr); ptr += 4; // max: ptr = &uid->values[66] @@ -204,7 +204,7 @@ void GetSafePixelShaderId(PIXELSHADERUIDSAFE *uid, DSTALPHA_MODE dstAlphaMode, u *ptr++ = bpmem.tevindref.hex; // 31 - for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1; ++i) // up to 16 times + for (unsigned int i = 0; i < bpmem.genMode.numtevstages+1u; ++i) // up to 16 times { *ptr++ = bpmem.combiners[i].colorC.hex; // 32+5*i *ptr++ = bpmem.combiners[i].alphaC.hex; // 33+5*i From f7b0c8684bc56efe256232d618de3376ed965232 Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 12 Jan 2013 15:06:06 +0100 Subject: [PATCH 16/17] BPMemory: Expose more register descriptions for FifoPlayer --- Source/Core/VideoCommon/Src/BPMemory.cpp | 135 ++++++++++++++++++++++- 1 file changed, 134 insertions(+), 1 deletion(-) diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp index ca0e748cb0..38489bcf7a 100644 --- a/Source/Core/VideoCommon/Src/BPMemory.cpp +++ b/Source/Core/VideoCommon/Src/BPMemory.cpp @@ -55,6 +55,11 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size snprintf(name, name_size, #reg); \ (void)(reg); + case BPMEM_GENMODE: // 0x00 + SetRegName(BPMEM_GENMODE); + // TODO: Description + break; + case BPMEM_DISPLAYCOPYFILER: // 0x01 // TODO: This is actually the sample pattern used for copies from an antialiased EFB SetRegName(BPMEM_DISPLAYCOPYFILER); @@ -75,6 +80,28 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size } break; + case BPMEM_BLENDMODE: // 0x41 + { + SetRegName(BPMEM_BLENDMODE); + BlendMode mode; mode.hex = cmddata; + const char* dstfactors[] = { "0", "1", "src_color", "1-src_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* srcfactors[] = { "0", "1", "dst_color", "1-dst_color", "src_alpha", "1-src_alpha", "dst_alpha", "1-dst_alpha" }; + const char* logicmodes[] = { "0", "s & d", "s & ~d", "s", "~s & d", "d", "s ^ d", "s | d", "~(s | d)", "~(s ^ d)", "~d", "s | ~d", "~s", "~s | d", "~(s & d)", "1" }; + snprintf(desc, desc_size, "Enable: %s\n" + "Logic ops: %s\n" + "Dither: %s\n" + "Color write: %s\n" + "Alpha write: %s\n" + "Dest factor: %s\n" + "Source factor: %s\n" + "Subtract: %s\n" + "Logic mode: %s\n", + no_yes[mode.blendenable], no_yes[mode.logicopenable], no_yes[mode.dither], + no_yes[mode.colorupdate], no_yes[mode.alphaupdate], dstfactors[mode.dstfactor], + srcfactors[mode.srcfactor], no_yes[mode.subtract], logicmodes[mode.logicmode]); + } + break; + case BPMEM_EFB_BR: // 0x4A { // TODO: Misleading name, should be BPMEM_EFB_WH instead @@ -148,7 +175,113 @@ void GetBPRegInfo(const u8* data, char* name, size_t name_size, char* desc, size // TODO: Description break; -#undef SET_REG_NAME + case BPMEM_TEV_COLOR_ENV: // 0xC0 + case BPMEM_TEV_COLOR_ENV+2: + case BPMEM_TEV_COLOR_ENV+4: + case BPMEM_TEV_COLOR_ENV+8: + case BPMEM_TEV_COLOR_ENV+10: + case BPMEM_TEV_COLOR_ENV+12: + case BPMEM_TEV_COLOR_ENV+14: + case BPMEM_TEV_COLOR_ENV+16: + case BPMEM_TEV_COLOR_ENV+18: + case BPMEM_TEV_COLOR_ENV+20: + case BPMEM_TEV_COLOR_ENV+22: + case BPMEM_TEV_COLOR_ENV+24: + case BPMEM_TEV_COLOR_ENV+26: + case BPMEM_TEV_COLOR_ENV+28: + case BPMEM_TEV_COLOR_ENV+30: + { + SetRegName(BPMEM_TEV_COLOR_ENV); + TevStageCombiner::ColorCombiner cc; cc.hex = cmddata; + const char* tevin[] = + { + "prev.rgb", "prev.aaa", + "c0.rgb", "c0.aaa", + "c1.rgb", "c1.aaa", + "c2.rgb", "c2.aaa", + "tex.rgb", "tex.aaa", + "ras.rgb", "ras.aaa", + "ONE", "HALF", "konst.rgb", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev.rgb", "c0.rgb", "c1.rgb", "c2.rgb" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n", + (data[0] - BPMEM_TEV_COLOR_ENV)/2, tevin[cc.a], tevin[cc.b], tevin[cc.c], tevin[cc.d], + tevbias[cc.bias], tevop[cc.op], no_yes[cc.clamp], tevscale[cc.shift], tevout[cc.dest]); + break; + } + + case BPMEM_TEV_ALPHA_ENV: // 0xC1 + case BPMEM_TEV_ALPHA_ENV+2: + case BPMEM_TEV_ALPHA_ENV+4: + case BPMEM_TEV_ALPHA_ENV+6: + case BPMEM_TEV_ALPHA_ENV+8: + case BPMEM_TEV_ALPHA_ENV+10: + case BPMEM_TEV_ALPHA_ENV+12: + case BPMEM_TEV_ALPHA_ENV+14: + case BPMEM_TEV_ALPHA_ENV+16: + case BPMEM_TEV_ALPHA_ENV+18: + case BPMEM_TEV_ALPHA_ENV+20: + case BPMEM_TEV_ALPHA_ENV+22: + case BPMEM_TEV_ALPHA_ENV+24: + case BPMEM_TEV_ALPHA_ENV+26: + case BPMEM_TEV_ALPHA_ENV+28: + case BPMEM_TEV_ALPHA_ENV+30: + { + SetRegName(BPMEM_TEV_ALPHA_ENV); + TevStageCombiner::AlphaCombiner ac; ac.hex = cmddata; + const char* tevin[] = + { + "prev", "c0", "c1", "c2", + "tex", "ras", "konst", "ZERO", + }; + const char* tevbias[] = { "0", "+0.5", "-0.5", "compare" }; + const char* tevop[] = { "add", "sub" }; + const char* tevscale[] = { "1", "2", "4", "0.5" }; + const char* tevout[] = { "prev", "c0", "c1", "c2" }; + snprintf(desc, desc_size, "tev stage: %d\n" + "a: %s\n" + "b: %s\n" + "c: %s\n" + "d: %s\n" + "bias: %s\n" + "op: %s\n" + "clamp: %s\n" + "scale factor: %s\n" + "dest: %s\n" + "ras sel: %d\n" + "tex sel: %d\n", + (data[0] - BPMEM_TEV_ALPHA_ENV)/2, tevin[ac.a], tevin[ac.b], tevin[ac.c], tevin[ac.d], + tevbias[ac.bias], tevop[ac.op], no_yes[ac.clamp], tevscale[ac.shift], tevout[ac.dest], + ac.rswap, ac.tswap); + break; + } + + case BPMEM_ALPHACOMPARE: // 0xF3 + { + SetRegName(BPMEM_ALPHACOMPARE); + AlphaTest test; test.hex = cmddata; + const char* functions[] = { "NEVER", "LESS", "EQUAL", "LEQUAL", "GREATER", "NEQUAL", "GEQUAL", "ALWAYS" }; + const char* logic[] = { "AND", "OR", "XOR", "XNOR" }; + snprintf(desc, desc_size, "test 1: %s (ref: %#02x)\n" + "test 2: %s (ref: %#02x)\n" + "logic: %s\n", + functions[test.comp0], test.ref0, functions[test.comp1], test.ref1, logic[test.logic]); + break; + } + +#undef SetRegName } } From 6f391a2df0c7903b8da046971a2de2797f6fe66f Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Sat, 12 Jan 2013 20:46:49 -0500 Subject: [PATCH 17/17] Set focus on memcard manager after losing it. --- Source/Core/DolphinWX/Src/MemcardManager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/Core/DolphinWX/Src/MemcardManager.cpp b/Source/Core/DolphinWX/Src/MemcardManager.cpp index 76c77a0543..d11a8575ff 100644 --- a/Source/Core/DolphinWX/Src/MemcardManager.cpp +++ b/Source/Core/DolphinWX/Src/MemcardManager.cpp @@ -471,6 +471,7 @@ bool CMemcardManager::CopyDeleteSwitch(u32 error, int slot) PanicAlert(E_UNK); break; } + SetFocus(); return true; }