M CHANGES → CHANGES

@@ -33,7 +33,7 @@ - All: Fix fullscreen config option being ignored
  - GBA BIOS: Implement BitUnPack
  - GBA: Add savegame override for Crash Bandicoot 2
  - ARM7: PSR mode bits should not get sign extended
- - GBA: Only unhalt CPU if an IRQ actually fires
+ - GBA: Only unhalt CPU if appropriate bit is set in IE
  - GBA Video: Fix out of bounds sprite transforms
 Misc:
  - SDL: Remove scancode key input

M src/arm/arm.c → src/arm/arm.c

@@ -147,7 +147,6 @@ cpu->irqh.reset(cpu);
 }
 
 void ARMRaiseIRQ(struct ARMCore* cpu) {
-	cpu->halted = 0;
 	if (cpu->cpsr.i) {
 		return;
 	}

M src/gba/gba.c → src/gba/gba.c

@@ -665,8 +665,11 @@
 void GBARaiseIRQ(struct GBA* gba, enum GBAIRQ irq) {
 	gba->memory.io[REG_IF >> 1] |= 1 << irq;
 
-	if (gba->memory.io[REG_IME >> 1] && (gba->memory.io[REG_IE >> 1] & 1 << irq)) {
-		ARMRaiseIRQ(gba->cpu);
+	if (gba->memory.io[REG_IE >> 1] & 1 << irq) {
+		gba->cpu->halted = 0;
+		if (gba->memory.io[REG_IME >> 1]) {
+			ARMRaiseIRQ(gba->cpu);
+		}
 	}
 }