overhaul cleanups

src/app/rom.h

@@ -473,6 +473,7 @@ class Rom : public core::ExperimentFlags {
   auto filename() const { return filename_; }
   auto is_loaded() const { return is_loaded_; }
   auto version() const { return version_; }
+  auto renderer() const { return renderer_; }
 
   uint8_t& operator[](int i) {
     if (i > size_) {

src/app/zelda3/dungeon/object_renderer.cc

@@ -106,7 +106,6 @@ void DungeonObjectRenderer::RenderObject(const SubtypeInfo& info) {
   while (true) {
     uint8_t opcode = cpu.ReadByte(cpu.PB << 16 | cpu.PC);
     cpu.ExecuteInstruction(opcode);
-    cpu.HandleInterrupts();
 
     if ((i != 0 &&
              (cpu.ReadWord((0x00 << 16 | cpu.SP() + 2)) == info.routine_ptr) ||

src/app/zelda3/dungeon/object_renderer.h

@@ -48,7 +48,8 @@ class DungeonObjectRenderer : public SharedRom {
   std::vector<uint8_t> rom_data_;
   emu::memory::MemoryImpl memory_;
   emu::ClockImpl clock_;
-  emu::Cpu cpu{memory_, clock_};
+  emu::memory::CpuCallbacks cpu_callbacks_;
+  emu::Cpu cpu{memory_, clock_, cpu_callbacks_};
   emu::video::Ppu ppu{memory_, clock_};
   gfx::Bitmap bitmap_;
   PseudoVram vram_;