M src/gb/cheats.c → src/gb/cheats.c

@@ -6,6 +6,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #include "cheats.h"
 
 #include "core/core.h"
+#include "gb/gb.h"
 #include "gb/memory.h"
 #include "util/string.h"
 
@@ -21,15 +22,24 @@ struct GBCheatPatch* patch = GBCheatPatchListGetPointer(&cheats->romPatches, i);
 		if (patch->applied) {
 			continue;
 		}
+		int segment = 0;
 		if (patch->checkByte) {
-			// TODO: All segments
-			int8_t value = GBView8(device->p->cpu, patch->address, 0);
-			if (value != patch->oldValue) {
+			struct GB* gb = device->p->board;
+			int maxSegment = (gb->memory.romSize + GB_SIZE_CART_BANK0 - 1) / GB_SIZE_CART_BANK0;
+			for (; segment < maxSegment; ++segment) {
+				int8_t value = GBView8(device->p->cpu, patch->address, segment);
+				if (value == patch->oldValue) {
+					break;
+				}
+			}
+			if (segment == maxSegment) {
 				continue;
 			}
 		}
-		GBPatch8(device->p->cpu, patch->address, patch->newValue, &patch->oldValue, 0);
+		// TODO: More than one segment
+		GBPatch8(device->p->cpu, patch->address, patch->newValue, &patch->oldValue, segment);
 		patch->applied = true;
+		patch->segment = segment;
 	}
 }
 
@@ -43,7 +53,7 @@ struct GBCheatPatch* patch = GBCheatPatchListGetPointer(&cheats->romPatches, i);
 		if (!patch->applied) {
 			continue;
 		}
-		GBPatch8(device->p->cpu, patch->address, patch->oldValue, &patch->newValue, 0);
+		GBPatch8(device->p->cpu, patch->address, patch->oldValue, &patch->newValue, patch->segment);
 		patch->applied = false;
 	}
 }

M src/gb/cheats.h → src/gb/cheats.h

@@ -22,6 +22,7 @@ struct GBCheatPatch {
 	uint16_t address;
 	int8_t newValue;
 	int8_t oldValue;
+	int segment;
 	bool applied;
 	bool checkByte;
 };