diff --git a/src/xenia/cpu/breakpoint.cc b/src/xenia/cpu/breakpoint.cc
index 06382bc66..c18bfc99d 100644
--- a/src/xenia/cpu/breakpoint.cc
+++ b/src/xenia/cpu/breakpoint.cc
@@ -14,6 +14,9 @@
 namespace xe {
 namespace cpu {
 
+Breakpoint::Breakpoint(Processor* processor,
+                       std::function<void(uint32_t, uint64_t)> hit_callback)
+    : processor_(processor), hit_callback_(hit_callback) {}
 Breakpoint::Breakpoint(Processor* processor, uint32_t address,
                        std::function<void(uint32_t, uint64_t)> hit_callback)
     : processor_(processor), address_(address), hit_callback_(hit_callback) {}
diff --git a/src/xenia/cpu/breakpoint.h b/src/xenia/cpu/breakpoint.h
index d3d65be5b..e7740cd1a 100644
--- a/src/xenia/cpu/breakpoint.h
+++ b/src/xenia/cpu/breakpoint.h
@@ -17,11 +17,17 @@ namespace cpu {
 
 class Breakpoint {
  public:
+  Breakpoint(Processor* processor,
+             std::function<void(uint32_t, uint64_t)> hit_callback);
   Breakpoint(Processor* processor, uint32_t address,
              std::function<void(uint32_t, uint64_t)> hit_callback);
   ~Breakpoint();
 
   uint32_t address() const { return address_; }
+  void set_address(uint32_t address) {
+    assert_false(installed_);
+    address_ = address;
+  }
   bool installed() const { return installed_; }
 
   bool Install();