summaryrefslogtreecommitdiff
path: root/asm/libagbsyscall.s
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2017-03-04 23:32:12 -0600
committerDiegoisawesome <diego@domoreaweso.me>2017-03-04 23:32:12 -0600
commitd12fd5c5ce574dd920a968794591afe7d42659fb (patch)
tree95a469d0243864473d13cd19082827cc89fe1a69 /asm/libagbsyscall.s
parent56f5e8bdabdc9cb18f65eccc4de66b2932489db1 (diff)
parent83ae14e2b9e2af7ce3eb01383fe3466357ac30b1 (diff)
Merge remote-tracking branch 'refs/remotes/pret/master'
Diffstat (limited to 'asm/libagbsyscall.s')
-rw-r--r--asm/libagbsyscall.s5
1 files changed, 3 insertions, 2 deletions
diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s
index 6161eb2df..d5639f689 100644
--- a/asm/libagbsyscall.s
+++ b/asm/libagbsyscall.s
@@ -1,3 +1,4 @@
+ .include "constants/gba_constants.inc"
.include "asm/macros.inc"
.syntax unified
@@ -87,10 +88,10 @@ RegisterRamReset: @ 82E70A8
thumb_func_start SoftReset
@ void SoftReset()
SoftReset: @ 82E70AC
- ldr r3, =0x04000208
+ ldr r3, =REG_IME
movs r2, 0
strb r2, [r3]
- ldr r1, =gUnknown_03007F00
+ ldr r1, =0x3007F00
mov sp, r1
swi 0x1
swi 0