GBA Cheats: Fix Pro Action Replay and GameShark issues when used together

This commit is contained in:
Jeffrey Pfau 2015-07-06 23:12:06 -07:00
parent fd809b3b39
commit b4c3440bc4
3 changed files with 4 additions and 1 deletions

View File

@ -57,6 +57,7 @@ Bugfixes:
- ARM7: ARMHotplugDetach should call deinit
- Qt: Fix window being too tall after exiting fullscreen
- Qt: Fix a missing va_end call in the log handler lambda within the GameController constructor
- GBA Cheats: Fix Pro Action Replay and GameShark issues when used together
Misc:
- Qt: Handle saving input settings better
- Debugger: Free watchpoints in addition to breakpoints

View File

@ -197,6 +197,7 @@ bool GBACheatAddGameShark(struct GBACheatSet* set, uint32_t op1, uint32_t op2) {
switch (set->gsaVersion) {
case 0:
case 3:
GBACheatSetGameSharkVersion(set, 1);
// Fall through
case 1:

View File

@ -297,9 +297,10 @@ bool GBACheatAddProActionReplay(struct GBACheatSet* set, uint32_t op1, uint32_t
switch (set->gsaVersion) {
case 0:
case 1:
GBACheatSetGameSharkVersion(set, 3);
// Fall through
case 1:
case 3:
GBACheatDecryptGameShark(&o1, &o2, set->gsaSeeds);
return GBACheatAddProActionReplayRaw(set, o1, o2);
}