summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorLPFaint99 <lpfaint99@gmail.com>2009-03-08 18:12:57 +0000
committerLPFaint99 <lpfaint99@gmail.com>2009-03-08 18:12:57 +0000
commitfeb670044e05b5db309fa0dfafe9b34a9c7bf7f5 (patch)
tree70671b44bb334a1c06b27deac688caa515700ff8 /Source/Core
parent148934ff99b446a14ef66dfa3d101ca9d7942f1d (diff)
My attempt at a Flag for Italy, feel free to improve on it :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2615 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/HW/Sram.h156
-rw-r--r--Source/Core/DolphinWX/Src/GameListCtrl.cpp4
-rw-r--r--Source/Core/DolphinWX/resources/Flag_Italy.xpm80
3 files changed, 161 insertions, 79 deletions
diff --git a/Source/Core/Core/Src/HW/Sram.h b/Source/Core/Core/Src/HW/Sram.h
index 56bf046aab..c0b956ff93 100644
--- a/Source/Core/Core/Src/HW/Sram.h
+++ b/Source/Core/Core/Src/HW/Sram.h
@@ -1,79 +1,79 @@
-// Copyright (C) 2003-2008 Dolphin Project.
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, version 2.0.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License 2.0 for more details.
-
-// A copy of the GPL 2.0 should have been included with the program.
-// If not, see http://www.gnu.org/licenses/
-
-// Official SVN repository and contact information can be found at
-// http://code.google.com/p/dolphin-emu/
-
-// Modified code taken from libogc
-/*-------------------------------------------------------------
-
-system.h -- OS functions and initialization
-
-Copyright (C) 2004
-Michael Wiedenbauer (shagkur)
-Dave Murphy (WinterMute)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you
-must not claim that you wrote the original software. If you use
-this software in a product, an acknowledgment in the product
-documentation would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-
-
--------------------------------------------------------------*/
-#ifndef __SRAM_h__
-#define __SRAM_h__
-
-#include "Common.h"
-
-#pragma pack(push,1)
-union SRAM
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+// Modified code taken from libogc
+/*-------------------------------------------------------------
+
+system.h -- OS functions and initialization
+
+Copyright (C) 2004
+Michael Wiedenbauer (shagkur)
+Dave Murphy (WinterMute)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you
+must not claim that you wrote the original software. If you use
+this software in a product, an acknowledgment in the product
+documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+
+
+-------------------------------------------------------------*/
+#ifndef __SRAM_h__
+#define __SRAM_h__
+
+#include "Common.h"
+
+#pragma pack(push,1)
+union SRAM
{
- u8 p_SRAM[64];
- struct _syssram { // Stored configuration value from the system SRAM area
- u8 checksum[2]; // holds the block checksum.
- u8 checksum_inv[2]; // holds the inverse block checksum
- u8 ead0[4]; // unknown attribute
- u8 ead1[4]; // unknown attribute
- u8 counter_bias[4]; // bias value for the realtime clock
- s8 display_offsetH; // pixel offset for the VI
- u8 ntd; // unknown attribute
- u8 lang; // language of system
- u8 flags; // device and operations flag
-
- // Stored configuration value from the extended SRAM area
- u8 flash_id[2][12]; // flash_id[2][12] 96bit memorycard unlock flash ID
- u8 wirelessKbd_id[4]; // Device ID of last connected wireless keyboard
- u8 wirelessPad_id[8]; // 16bit device ID of last connected pad.
- u8 dvderr_code; // last non-recoverable error from DVD interface
- u8 __padding0; // padding
- u8 flashID_chksum[4]; // 16bit checksum of unlock flash ID
- u8 __padding1[2]; // padding - libogc has this as [4]? I have it as 2 to make it 64
- }syssram;
-};
-#pragma pack(pop)
-#endif
+ u8 p_SRAM[64];
+ struct _syssram { // Stored configuration value from the system SRAM area
+ u8 checksum[2]; // holds the block checksum.
+ u8 checksum_inv[2]; // holds the inverse block checksum
+ u8 ead0[4]; // unknown attribute
+ u8 ead1[4]; // unknown attribute
+ u8 counter_bias[4]; // bias value for the realtime clock
+ s8 display_offsetH; // pixel offset for the VI
+ u8 ntd; // unknown attribute
+ u8 lang; // language of system
+ u8 flags; // device and operations flag
+
+ // Stored configuration value from the extended SRAM area
+ u8 flash_id[2][12]; // flash_id[2][12] 96bit memorycard unlock flash ID
+ u8 wirelessKbd_id[4]; // Device ID of last connected wireless keyboard
+ u8 wirelessPad_id[8]; // 16bit device ID of last connected pad.
+ u8 dvderr_code; // last non-recoverable error from DVD interface
+ u8 __padding0; // padding
+ u8 flashID_chksum[4]; // 16bit checksum of unlock flash ID
+ u8 __padding1[2]; // padding - libogc has this as [4]? I have it as 2 to make it 64
+ }syssram;
+};
+#pragma pack(pop)
+#endif
diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index 724c77026a..64b2fa34c2 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -34,6 +34,7 @@
#if USE_XPM_BITMAPS
#include "../resources/Flag_Europe.xpm"
#include "../resources/Flag_France.xpm"
+ #include "../resources/Flag_Italy.xpm"
#include "../resources/Flag_Japan.xpm"
#include "../resources/Flag_USA.xpm"
#endif // USE_XPM_BITMAPS
@@ -110,9 +111,10 @@ void CGameListCtrl::InitBitmaps()
wxIcon iconTemp;
iconTemp.CopyFromBitmap(wxBitmap(Flag_Europe_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_EUROPE] = m_imageListSmall->Add(iconTemp);
- m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
iconTemp.CopyFromBitmap(wxBitmap(Flag_France_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_FRANCE] = m_imageListSmall->Add(iconTemp);
+ iconTemp.CopyFromBitmap(wxBitmap(Flag_Italy_xpm));
+ m_FlagImageIndex[DiscIO::IVolume::COUNTRY_ITALY] = m_imageListSmall->Add(iconTemp);
iconTemp.CopyFromBitmap(wxBitmap(Flag_USA_xpm));
m_FlagImageIndex[DiscIO::IVolume::COUNTRY_USA] = m_imageListSmall->Add(iconTemp);
iconTemp.CopyFromBitmap(wxBitmap(Flag_Japan_xpm));
diff --git a/Source/Core/DolphinWX/resources/Flag_Italy.xpm b/Source/Core/DolphinWX/resources/Flag_Italy.xpm
new file mode 100644
index 0000000000..c47c87791a
--- /dev/null
+++ b/Source/Core/DolphinWX/resources/Flag_Italy.xpm
@@ -0,0 +1,80 @@
+/* XPM */
+static const char *const Flag_Italy_xpm[] = {
+"96 32 45 1",
+" c None",
+". c #000000",
+"+ c #006F00",
+"@ 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",
+" ",
+" ",
+" ",
+" ",
+" ",
+"................................ ",
+".++++++++++@@@@@@@@@@@#########. ",
+".++++++++++@@@@@@@@@@@#########. ",
+".++++++++++@@@@@@@@@@@#########. ",
+".++++++++++@@@@@@@@@@@#########. ",
+".$$$$$$$$$$@@@@@@@@@@@#########. ",
+".%%%%%%%%%%&&&&&&&&&&&*********. ",
+".==========-----------;;;;;;;;;. ",
+".>>>>>>>>>>,,,,,,,,,,,'''''''''. ",
+".))))))))))!!!!!!!!!!!~~~~~~~~~. ",
+".{{{{{{{{{{]]]]]]]]]]]^^^^^^^^^. ",
+".//////////(((((((((((_________. ",
+".::::::::::<<<<<<<<<<<[[[[[[[[[. ",
+".}}}}}}}}}}|||||||||||111111111. ",
+".222222222233333333333444444444. ",
+".555555555566666666666777777777. ",
+".888888888899999999999000000000. ",
+".aaaaaaaaaabbbbbbbbbbbccccccccc. ",
+".ddddddddddeeeeeeeeeeefffffffff. ",
+"................................ ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};