diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp index 759a51d58..9e38ba371 100644 --- a/desmume/src/NDSSystem.cpp +++ b/desmume/src/NDSSystem.cpp @@ -1492,7 +1492,7 @@ static void execHardware_hstart() } else if (nds.VCount == 262) { - if (!NDS_ARM9.freeze && nds.overclock < 2 && CommonSettings.pokehax) + if (!NDS_ARM9.freeze && nds.overclock < 2 && CommonSettings.gamehacks) { //suspend arm7 during overclocking so much doesn't run out of control //actually, this isn't needed yet. diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h index 6d8d3c836..78138321b 100644 --- a/desmume/src/NDSSystem.h +++ b/desmume/src/NDSSystem.h @@ -1,6 +1,6 @@ /* Copyright (C) 2006 yopyop - Copyright (C) 2008-2016 DeSmuME team + Copyright (C) 2008-2017 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -502,7 +502,7 @@ extern struct TCommonSettings { , cheatsDisable(false) , rigorous_timing(false) , advanced_timing(true) - , pokehax(false) + , gamehacks(false) , micMode(InternalNoise) , spuInterpolationMode(1) , manualBackupType(0) @@ -579,7 +579,7 @@ extern struct TCommonSettings { int num_cores; bool single_core() { return num_cores==1; } bool rigorous_timing; - bool pokehax; + bool gamehacks; int StylusPressure; bool StylusJitter; diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index 9de4629bd..da5038cfc 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -51,7 +51,7 @@ CommandLine::CommandLine() , _num_cores(-1) , _rigorous_timing(0) , _advanced_timing(-1) -, _pokehax(-1) +, _gamehacks(-1) , _texture_deposterize(-1) , _texture_smooth(-1) , _slot1(NULL) @@ -125,7 +125,7 @@ ENDL #endif " --advanced-timing Use advanced bus-level timing; default ON" ENDL " --rigorous-timing Use more realistic component timings; default OFF" ENDL -" --pokehax Use game-specific hacks; default OFF" ENDL +" --gamehacks Use game-specific hacks; default ON" ENDL " --spu-advanced Enable advanced SPU capture functions (reverb)" ENDL " --backupmem-db Use DB for autodetecting backup memory type" ENDL ENDL @@ -246,7 +246,7 @@ bool CommandLine::parse(int argc,char **argv) #endif { "rigorous-timing", no_argument, &_rigorous_timing, 1}, { "advanced-timing", no_argument, &_advanced_timing, 1}, - { "pokehax", no_argument, &_pokehax, 1}, + { "gamehacks", no_argument, &_gamehacks, 1}, { "spu-advanced", no_argument, &_spu_advanced, 1}, { "backupmem-db", no_argument, &autodetect_method, 1}, @@ -355,7 +355,7 @@ bool CommandLine::parse(int argc,char **argv) if(_num_cores != -1) CommonSettings.num_cores = _num_cores; if(_rigorous_timing) CommonSettings.rigorous_timing = true; if(_advanced_timing != -1) CommonSettings.advanced_timing = _advanced_timing==1; - if(_pokehax != -1) CommonSettings.pokehax = _pokehax==1; + if(_gamehacks != -1) CommonSettings.gamehacks = _gamehacks==1; #ifdef HAVE_JIT if(_cpu_mode != -1) CommonSettings.use_jit = (_cpu_mode==1); diff --git a/desmume/src/commandline.h b/desmume/src/commandline.h index 00fea0ab5..2d04061b3 100644 --- a/desmume/src/commandline.h +++ b/desmume/src/commandline.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009-2016 DeSmuME team + Copyright (C) 2009-2017 DeSmuME team This file is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -97,7 +97,7 @@ private: int _num_cores; int _rigorous_timing; int _advanced_timing; - int _pokehax; + int _gamehacks; int _texture_deposterize; int _texture_smooth; #ifdef HAVE_JIT diff --git a/desmume/src/frontend/windows/main.cpp b/desmume/src/frontend/windows/main.cpp index 985609f3d..08018485a 100644 --- a/desmume/src/frontend/windows/main.cpp +++ b/desmume/src/frontend/windows/main.cpp @@ -2988,7 +2988,7 @@ int _main() CommonSettings.showGpu.sub = GetPrivateProfileInt("Display", "SubGpu", 1, IniName) != 0; CommonSettings.spu_advanced = GetPrivateProfileBool("Sound", "SpuAdvanced", false, IniName); CommonSettings.advanced_timing = GetPrivateProfileBool("Emulation", "AdvancedTiming", true, IniName); - CommonSettings.pokehax = GetPrivateProfileBool("Emulation", "Pokehax", false, IniName); + CommonSettings.gamehacks = GetPrivateProfileBool("Emulation", "GameHacks", true, IniName); CommonSettings.StylusJitter = GetPrivateProfileBool("Emulation", "StylusJitter", false, IniName); CommonSettings.GFX3D_Zelda_Shadow_Depth_Hack = GetPrivateProfileInt("3D", "ZeldaShadowDepthHack", 0, IniName); @@ -6447,7 +6447,7 @@ LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, L CheckDlgItem(hDlg,IDC_CHECKBOX_DEBUGGERMODE,CommonSettings.DebugConsole); CheckDlgItem(hDlg,IDC_CHECKBOX_ENSATAEMULATION,CommonSettings.EnsataEmulation); CheckDlgItem(hDlg, IDC_CHECBOX_ADVANCEDTIMING, CommonSettings.advanced_timing); - CheckDlgItem(hDlg, IDC_CHECBOX_POKEHAX, CommonSettings.pokehax); + CheckDlgItem(hDlg, IDC_CHECKBOX_GAMEHACKS, CommonSettings.gamehacks); CheckDlgItem(hDlg,IDC_USEEXTBIOS,CommonSettings.UseExtBIOS); CheckDlgItem(hDlg, IDC_BIOSSWIS, CommonSettings.SWIFromBIOS); CheckDlgItem(hDlg, IDC_PATCHSWI3, CommonSettings.PatchSWI3); @@ -6553,7 +6553,7 @@ LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, L CommonSettings.DebugConsole = IsDlgCheckboxChecked(hDlg, IDC_CHECKBOX_DEBUGGERMODE); CommonSettings.EnsataEmulation = IsDlgCheckboxChecked(hDlg, IDC_CHECKBOX_ENSATAEMULATION); CommonSettings.advanced_timing = IsDlgCheckboxChecked(hDlg, IDC_CHECBOX_ADVANCEDTIMING); - CommonSettings.pokehax = IsDlgCheckboxChecked(hDlg, IDC_CHECKBOX_POKEHAX); + CommonSettings.gamehacks = IsDlgCheckboxChecked(hDlg, IDC_CHECKBOX_GAMEHACKS); #ifdef HAVE_JIT CommonSettings.use_jit = IsDlgCheckboxChecked(hDlg, IDC_CHECKBOX_DYNAREC); if (CommonSettings.use_jit) @@ -6566,7 +6566,7 @@ LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, L WritePrivateProfileInt("Emulation", "DebugConsole", ((CommonSettings.DebugConsole == true) ? 1 : 0), IniName); WritePrivateProfileInt("Emulation", "EnsataEmulation", ((CommonSettings.EnsataEmulation == true) ? 1 : 0), IniName); WritePrivateProfileBool("Emulation", "AdvancedTiming", CommonSettings.advanced_timing, IniName); - WritePrivateProfileBool("Emulation", "Pokehax", CommonSettings.pokehax, IniName); + WritePrivateProfileBool("Emulation", "GameHacks", CommonSettings.gamehacks, IniName); WritePrivateProfileInt("BIOS", "UseExtBIOS", ((CommonSettings.UseExtBIOS == true) ? 1 : 0), IniName); WritePrivateProfileString("BIOS", "ARM9BIOSFile", CommonSettings.ARM9BIOS, IniName); WritePrivateProfileString("BIOS", "ARM7BIOSFile", CommonSettings.ARM7BIOS, IniName); diff --git a/desmume/src/frontend/windows/resource.h b/desmume/src/frontend/windows/resource.h index 7194abd4c..f92724d7e 100644 --- a/desmume/src/frontend/windows/resource.h +++ b/desmume/src/frontend/windows/resource.h @@ -369,8 +369,7 @@ #define IDC_3DCORE 1028 #define IDC_SNDCTRL_ENABLE 1028 #define IDC_DTP_TIME 1028 -#define IDC_CHECBOX_POKEHAX 1028 -#define IDC_CHECKBOX_POKEHAX 1028 +#define IDC_CHECKBOX_GAMEHACKS 1028 #define IDC_TXT_COMPILED 1029 #define IDC_SNDCTRL_CH1NOMIX 1029 #define IDC_DTP_DATE2 1029 diff --git a/desmume/src/frontend/windows/resources.rc b/desmume/src/frontend/windows/resources.rc index 47bef6962..10f7467f6 100644 --- a/desmume/src/frontend/windows/resources.rc +++ b/desmume/src/frontend/windows/resources.rc @@ -452,7 +452,7 @@ BEGIN EDITTEXT IDC_JIT_BLOCK_SIZE,97,108,30,12,ES_NUMBER LTEXT "(1 - accuracy, 100 - fastest)",IDC_STATIC,132,110,90,12 LTEXT "Enabling this will get you 0-50% speedups. It is optional because it may still contain some small bugs, due mostly merely to newness, which can safely be fixed in time. Furthermore, you may have to tune the block size to prevent some games from breaking.",IDC_STATIC,14,123,210,34 - CONTROL "Enable Pokehax",IDC_CHECKBOX_POKEHAX,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,71,10 + CONTROL "Enable Game Hacks",IDC_CHECKBOX_GAMEHACKS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,52,85,10 PUSHBUTTON "...",IDC_ARM9BIOSBROWSE,440,41,20,14 GROUPBOX "BIOS",IDC_STATIC,240,1,230,118 PUSHBUTTON "...",IDC_ARM7BIOSBROWSE,440,70,20,14