summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/macros/function.inc4
-rw-r--r--asm/secure.s12
2 files changed, 12 insertions, 4 deletions
diff --git a/asm/macros/function.inc b/asm/macros/function.inc
index 4e0afcb7..6b9e5f40 100644
--- a/asm/macros/function.inc
+++ b/asm/macros/function.inc
@@ -1,5 +1,5 @@
.macro arm_func_start name
- .align 2, 0
+ .balign 4, 0
.global \name
.arm
.endm
@@ -9,7 +9,7 @@
.endm
.macro thumb_func_start name
- .align 2, 0
+ .balign 4, 0
.global \name
.thumb
.endm
diff --git a/asm/secure.s b/asm/secure.s
index 05d39175..18313c93 100644
--- a/asm/secure.s
+++ b/asm/secure.s
@@ -3,9 +3,17 @@
.section .text
-.incbin "baserom.nds", 0x4000, 0x5F2
+.incbin "baserom.nds", 0x4000, 0x19E
- thumb_func_start FUN_020005F2
+ non_word_aligned_thumb_func_start FUN_0200019E
+FUN_0200019E: ; 0x0200019E
+ swi 13
+ bx lr
+ thumb_func_end FUN_0200019E
+
+.incbin "baserom.nds", 0x41A2, 0x450
+
+ non_word_aligned_thumb_func_start FUN_020005F2
FUN_020005F2:
swi 3
bx lr