M CHANGES → CHANGES

@@ -57,6 +57,7 @@ - GBA Audio: Fix 8-bit writes to audio channel 3 frequency
  - 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

M src/gba/cheats/gameshark.c → src/gba/cheats/gameshark.c

@@ -197,6 +197,7 @@ GBACheatRegisterLine(set, line);
 
 	switch (set->gsaVersion) {
 	case 0:
+	case 3:
 		GBACheatSetGameSharkVersion(set, 1);
 	// Fall through
 	case 1:

M src/gba/cheats/parv3.c → src/gba/cheats/parv3.c

@@ -297,9 +297,10 @@ GBACheatRegisterLine(set, line);
 
 	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);
 	}