Use the bios return from irq code again. Fixes #150

Gericom · Apr 14, 2024 · 08eb851 · 08eb851
1 parent d1efd9b
commit 08eb851
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/code/core/arm9/source/VirtualMachine/VMDtcm.s b/code/core/arm9/source/VirtualMachine/VMDtcm.s
@@ -45,6 +45,6 @@
 #endif
 
 .org vm_returnFromIrqAddress - VM_DTCM_BASE
-    .word vm_returnFromIrq
+    .word gGbaBios + 0x138
 
 .end
diff --git a/code/core/arm9/source/VirtualMachine/VMIrq.s b/code/core/arm9/source/VirtualMachine/VMIrq.s
@@ -234,8 +234,3 @@ arm_func vm_jumpToIrqHandlerCommon
     mov lr, r4
     ldr r4, DTCM(vm_irqSavedR4)
     movs pc, lr
-
-.text
-arm_func vm_returnFromIrq
-    pop {r0-r3,r12,lr}
-    vmSUBS pc, lr, 4