diff --git a/Binary/win32/Dolphin.ini b/Binary/win32/Dolphin.ini index 35e1743984..59ebb5b624 100644 --- a/Binary/win32/Dolphin.ini +++ b/Binary/win32/Dolphin.ini @@ -2,4 +2,18 @@ GFXPlugin = Plugins\Plugin_VideoOGL.dll DSPPlugin = Plugins\Plugin_DSP_NULL.dll PadPlugin = Plugins\Plugin_PadSimple.dll - +[General] +LastFilename = +GCMPathes = 1 +GCMPath0 = E:\GCM +[Core] +GFXPlugin = Plugins\Plugin_VideoOGL.dll +DSPPlugin = Plugins\Plugin_DSP_NULL.dll +PadPlugin = Plugins\Plugin_PadSimple.dll +HLEBios = False +UseDynarec = False +UseDualCore = False +Throttle = True +LockThreads = True +DefaultGCM = +OptimizeQuantizers = True diff --git a/Binary/win32/Patches/GALP01.ini b/Binary/win32/Patches/GALP01.ini new file mode 100644 index 0000000000..16cf78838d --- /dev/null +++ b/Binary/win32/Patches/GALP01.ini @@ -0,0 +1,51 @@ +[OnFrame] + +[ActionReplay] +mustcode? idk if it should be on, i had code problems so i added it anyway +003C04F4 98000000 +C434D344 00000800 + +OpenAllCharacters +003C015D 18000000 +0444CD30 FFFFFFFF + +infloterycoins +003C1AB7 18000000 +0444CF10 0000270F + +P1MustbeON - Vs.CharMod +003C629A 18000000 +08471634 00000040 +00471634 00000000 + +P1 - No Damage +003C0156 18000000 +04443E80 00000000 + +All Event matches open and complete +003C1ABF 18000000 +0444CF34 FFFFFFFF + +Mega jumps +003C1AC1 18000000 +044CA1DC 40000000 + +Item Appearance Modifier (bopie64) +003C4BBF 18000000 +043FB838 00000003 +043FB850 41000000 +043FB854 3F800000 + + +P1 Turbo B Button (donny2112) +003C0AFF 18000000 +0A45BF10 00000200 +0245BF10 00000000 + +One Hit Kills +003C26A9 18000000 +044C9578 40100000 + +Infinite Jumps +003C3BAE 18000000 +040CC114 60000000 diff --git a/Binary/x64/Dolphin.ini b/Binary/x64/Dolphin.ini index 35e1743984..eca54c1370 100644 --- a/Binary/x64/Dolphin.ini +++ b/Binary/x64/Dolphin.ini @@ -2,4 +2,18 @@ GFXPlugin = Plugins\Plugin_VideoOGL.dll DSPPlugin = Plugins\Plugin_DSP_NULL.dll PadPlugin = Plugins\Plugin_PadSimple.dll - +[General] +LastFilename = +GCMPathes = 1 +GCMPath0 = E:\GCM +[Core] +GFXPlugin = Plugins\Plugin_VideoOGL.dll +DSPPlugin = Plugins\Plugin_DSP.dll +PadPlugin = Plugins\Plugin_PadSimple.dll +HLEBios = False +UseDynarec = True +UseDualCore = False +Throttle = True +LockThreads = True +DefaultGCM = +OptimizeQuantizers = True diff --git a/Binary/x64/Patches/GALP01.ini b/Binary/x64/Patches/GALP01.ini new file mode 100644 index 0000000000..59767189f9 --- /dev/null +++ b/Binary/x64/Patches/GALP01.ini @@ -0,0 +1,50 @@ +[OnFrame] + +[ActionReplay] +mustcode? idk if it should be on, i had code problems so i added it anyway +003C04F4 98000000 +C434D344 00000800 + +Open All Characters +003C015D 18000000 +0444CD30 FFFFFFFF + +Infinite Lottery Coins +003C1AB7 18000000 +0444CF10 0000270F + +P1MustbeON - Vs.CharMod +003C629A 18000000 +08471634 00000040 +00471634 00000000 + +P1 - No Damage +003C0156 18000000 +04443E80 00000000 + +All Event matches open and complete +003C1ABF 18000000 +0444CF34 FFFFFFFF + +Mega jumps +003C1AC1 18000000 +044CA1DC 40000000 + +Item Appearance Modifier (bopie64) +003C4BBF 18000000 +043FB838 00000003 +043FB850 41000000 +043FB854 3F800000 + +P1 Turbo B Button (donny2112) +003C0AFF 18000000 +0A45BF10 00000200 +0245BF10 00000000 + +One Hit Kills +003C26A9 18000000 +044C9578 40100000 + +Infinite Jumps +003C3BAE 18000000 +040CC114 60000000 diff --git a/Source/Core/Common/Common.vcproj b/Source/Core/Common/Common.vcproj index 1fd746a46c..0e4a21c9fd 100644 --- a/Source/Core/Common/Common.vcproj +++ b/Source/Core/Common/Common.vcproj @@ -28,6 +28,7 @@ > = 0) { diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp index c2d2935423..54f6f454d8 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.cpp +++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp @@ -76,7 +76,7 @@ BEGIN_EVENT_TABLE(CCodeWindow, wxFrame) EVT_BUTTON(IDM_SETPC, CCodeWindow::OnCodeStep) EVT_BUTTON(IDM_GOTOPC, CCodeWindow::OnCodeStep) EVT_TEXT(IDM_ADDRBOX, CCodeWindow::OnAddrBoxChange) - EVT_LISTBOX(IDM_SYMBOLLIST, CCodeWindow::OnSymolListChange) + EVT_LISTBOX(IDM_SYMBOLLIST, CCodeWindow::OnSymbolListChange) EVT_LISTBOX(IDM_CALLSTACKLIST, CCodeWindow::OnCallstackListChange) EVT_HOST_COMMAND(wxID_ANY, CCodeWindow::OnHostMessage) EVT_MENU(IDM_LOGWINDOW, CCodeWindow::OnToggleLogWindow) @@ -411,7 +411,7 @@ void CCodeWindow::UpdateButtonStates() } -void CCodeWindow::OnSymolListChange(wxCommandEvent& event) +void CCodeWindow::OnSymbolListChange(wxCommandEvent& event) { int index = symbols->GetSelection(); Debugger::CSymbol* pSymbol = static_cast(symbols->GetClientData(index)); diff --git a/Source/Core/DebuggerWX/src/CodeWindow.h b/Source/Core/DebuggerWX/src/CodeWindow.h index 95db88ece6..0ad945abf1 100644 --- a/Source/Core/DebuggerWX/src/CodeWindow.h +++ b/Source/Core/DebuggerWX/src/CodeWindow.h @@ -73,7 +73,7 @@ class CCodeWindow wxTextCtrl* addrbox; DECLARE_EVENT_TABLE() - void OnSymolListChange(wxCommandEvent& event); + void OnSymbolListChange(wxCommandEvent& event); void OnCallstackListChange(wxCommandEvent& event); void OnCodeStep(wxCommandEvent& event); void OnAddrBoxChange(wxCommandEvent& event); diff --git a/Source/Core/DolphinWX/src/Main.cpp b/Source/Core/DolphinWX/src/Main.cpp index c395499390..f3170ce0e0 100644 --- a/Source/Core/DolphinWX/src/Main.cpp +++ b/Source/Core/DolphinWX/src/Main.cpp @@ -18,6 +18,7 @@ #include #include +#include "svnrev.h" #include "CPUDetect.h" #include "Globals.h" #include "Common.h" @@ -86,8 +87,12 @@ bool DolphinApp::OnInit() SConfig::GetInstance().LoadSettings(); wxInitAllImageHandlers(); // Create the main frame window - main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, - _T("Dolphin"), +#ifdef _DEBUG + const char *title = "Dolphin Debug SVN R " SVN_REV_STR; +#else + const char *title = "Dolphin SVN R " SVN_REV_STR; +#endif + main_frame = new CFrame((wxFrame*) NULL, wxID_ANY, title, wxPoint(100, 100), wxSize(800, 600)); // create debugger