Consolidate SNES::Init

src/app/emu/snes.cc

@@ -107,6 +107,14 @@ RomInfo SNES::ReadRomHeader(uint32_t offset) {
 }
 
 void SNES::Init(Rom& rom) {
+  // Setup observers for the memory space
+  memory_.AddObserver(&apu_);
+  memory_.AddObserver(&ppu_);
+
+  // Load the ROM into memory and set up the memory mapping
+  rom_data = rom.vector();
+  memory_.Initialize(rom_data);
+
   // Perform a long jump into a FastROM bank (if the ROM speed is FastROM)
   // Disable the emulation flag (switch to 65816 native mode)
   cpu_.E = 0;

src/app/emu/snes.h

@@ -68,16 +68,6 @@ class SNES : public DirectMemoryAccess {
     return static_cast<Cpu::UpdateMode>(cpu_mode_);
   }
 
-  void SetupMemory(Rom& rom) {
-    // Setup observers for the memory space
-    memory_.AddObserver(&apu_);
-    memory_.AddObserver(&ppu_);
-
-    // Load the ROM into memory and set up the memory mapping
-    rom_data = rom.vector();
-    memory_.Initialize(rom_data);
-  }
-
  private:
   void WriteToRegister(uint16_t address, uint8_t value) {
     memory_.WriteByte(address, value);