fix rumble event

ardean · Jun 12, 2018 · 4d1e2f6 · 4d1e2f6
1 parent 0909c89
commit 4d1e2f6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/dist/jsgbc-core.js b/dist/jsgbc-core.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jsgbc",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "jsGBC Core Emulator",
   "main": "./dist/jsgbc-core.js",
   "types": "./dist/typings/index.d.ts",

diff --git a/src/core/GameBoyCore.ts b/src/core/GameBoyCore.ts
@@ -337,12 +337,12 @@ export default class GameBoyCore {
     cartridge.connect(this);
     this.cartridge = cartridge;
 
-    if (this.cartridge && this.cartridge.mbc) this.cartridge.mbc.on("rumble", this.onRUMBLE);
-
     this.loadCartridgeRomIntoMemory();
     if (this.bootROM) this.loadBootROMIntoMemory();
 
     this.cartridge.interpret();
+
+    if (this.cartridge && this.cartridge.mbc) this.cartridge.mbc.on("rumble", this.onRUMBLE);
   }
 
   onRUMBLE() {