diff --git a/include/action_replay.hpp b/include/action_replay.hpp
index d9499cee..a6b97df9 100644
--- a/include/action_replay.hpp
+++ b/include/action_replay.hpp
@@ -5,6 +5,7 @@
 
 #include "helpers.hpp"
 #include "memory.hpp"
+#include "services/hid.hpp"
 
 class ActionReplay {
 	using Cheat = std::vector<u32>;  // A cheat is really just a bunch of 64-bit opcodes neatly encoded into 32-bit chunks
@@ -24,6 +25,7 @@ class ActionReplay {
 	// Program counter
 	u32 pc = 0;
 	Memory& mem;
+	HIDService& hid;
 
 	// Has the cheat ended?
 	bool running = false;
@@ -41,8 +43,10 @@ class ActionReplay {
 	void write16(u32 addr, u16 value);
 	void write32(u32 addr, u32 value);
 
+	void pushConditionBlock(bool condition);
+
   public:
-	ActionReplay(Memory& mem);
+	ActionReplay(Memory& mem, HIDService& hid);
 	void runCheat(const Cheat& cheat);
 	void reset();
 };
\ No newline at end of file
diff --git a/include/cheats.hpp b/include/cheats.hpp
index d2ee8166..6ada7d20 100644
--- a/include/cheats.hpp
+++ b/include/cheats.hpp
@@ -4,6 +4,7 @@
 
 #include "action_replay.hpp"
 #include "helpers.hpp"
+#include "services/hid.hpp"
 
 // Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time
 class Memory;
@@ -20,12 +21,12 @@ class Cheats {
 		std::vector<u32> instructions;
 	};
 
-	Cheats(Memory& mem);
+	Cheats(Memory& mem, HIDService& hid);
 	void addCheat(const Cheat& cheat);
 	void reset();
 	void run();
 
   private:
-	ActionReplay ar; // An ActionReplay cheat machine for executing CTRPF codes
+	ActionReplay ar;  // An ActionReplay cheat machine for executing CTRPF codes
 	std::vector<Cheat> cheats;
 };
\ No newline at end of file
diff --git a/src/core/action_replay.cpp b/src/core/action_replay.cpp
index 2db0ace3..ad391b36 100644
--- a/src/core/action_replay.cpp
+++ b/src/core/action_replay.cpp
@@ -1,6 +1,6 @@
 #include "action_replay.hpp"
 
-ActionReplay::ActionReplay(Memory& mem) : mem(mem) { reset(); }
+ActionReplay::ActionReplay(Memory& mem, HIDService& hid) : mem(mem), hid(hid) { reset(); }
 
 void ActionReplay::reset() {
 	// Default value of storage regs is 0
@@ -119,6 +119,9 @@ void ActionReplay::executeDType(const Cheat& cheat, u32 instruction) {
 		// DD000000 XXXXXXXX - if KEYPAD has value XXXXXXXX execute next block
 		case 0xDD000000: {
 			const u32 mask = cheat[pc++];
+			const u32 buttons = hid.getOldButtons();
+
+			pushConditionBlock((buttons & mask) == mask);
 			break;
 		}
 
@@ -194,4 +197,14 @@ void ActionReplay::executeDType(const Cheat& cheat, u32 instruction) {
 
 		default: Helpers::panic("ActionReplay: Unimplemented d-type opcode: %08X", instruction); break;
 	}
+}
+
+void ActionReplay::pushConditionBlock(bool condition) {
+	if (ifStackIndex >= 32) {
+		Helpers::warn("ActionReplay if stack overflowed");
+		running = false;
+		return;
+	}
+
+	ifStack[ifStackIndex++] = condition;
 }
\ No newline at end of file
diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp
index fd772550..4c63652b 100644
--- a/src/core/cheats.cpp
+++ b/src/core/cheats.cpp
@@ -1,6 +1,6 @@
 #include "cheats.hpp"
 
-Cheats::Cheats(Memory& mem) : ar(mem) { reset(); }
+Cheats::Cheats(Memory& mem, HIDService& hid) : ar(mem, hid) { reset(); }
 
 void Cheats::reset() {
 	cheats.clear();  // Unload loaded cheats
diff --git a/src/emulator.cpp b/src/emulator.cpp
index 39ab022c..ce42d273 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -16,7 +16,7 @@ __declspec(dllexport) DWORD AmdPowerXpressRequestHighPerformance = 1;
 
 Emulator::Emulator()
 	: config(std::filesystem::current_path() / "config.toml"), kernel(cpu, memory, gpu), cpu(memory, kernel), gpu(memory, config),
-	  memory(cpu.getTicksRef()), cheats(memory) {
+	  memory(cpu.getTicksRef()), cheats(memory, kernel.getServiceManager().getHID()) {
 	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS) < 0) {
 		Helpers::panic("Failed to initialize SDL2");
 	}