diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-01-09 16:48:01 -0500 |
| commit | c7722a492017dbd8a5fb3bb216062eb62129daf5 (patch) | |
| tree | 2a5c0ba6a6b9364aa93eb4a9a89b35153954ab63 /asm/libagbsyscall.s | |
| parent | 2d141bc612ffecc984f6b4238c2791ba8419a192 (diff) | |
| parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) | |
fixing merge conflicts
Diffstat (limited to 'asm/libagbsyscall.s')
| -rw-r--r-- | asm/libagbsyscall.s | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/asm/libagbsyscall.s b/asm/libagbsyscall.s index 3b59592b6..de59d4c27 100644 --- a/asm/libagbsyscall.s +++ b/asm/libagbsyscall.s @@ -1,5 +1,4 @@ .include "asm/macros.inc" - .syntax unified .text @@ -69,7 +68,7 @@ SoftReset: @ 81E0814 ldr r3, =0x04000208 movs r2, 0 strb r2, [r3] - ldr r1, =0x03007f00 + ldr r1, =0x03007f00 @ User Stack mov sp, r1 swi 0x1 swi 0 |