diff options
author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 12:27:06 -0500 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 12:27:06 -0500 |
commit | c0ce4f82ad10178eab328cb0da3f03639c3b5b8e (patch) | |
tree | 3996e049c7bf2dcbc17c651dc24628e92e80068e /asm | |
parent | ad3ef8944eb4e1291c1ac9bcf06a9f5779b20c55 (diff) |
Match first C function
Diffstat (limited to 'asm')
-rwxr-xr-x | asm/ewram.s | 4 | ||||
-rwxr-xr-x | asm/macros.inc | 1 | ||||
-rwxr-xr-x | asm/macros/function.inc | 29 | ||||
-rwxr-xr-x | asm/main.s | 6 | ||||
-rwxr-xr-x | asm/rom.s | 2 |
5 files changed, 41 insertions, 1 deletions
diff --git a/asm/ewram.s b/asm/ewram.s index 0857a08..7c53cf0 100755 --- a/asm/ewram.s +++ b/asm/ewram.s @@ -5,3 +5,7 @@ .space 0x3060 ds gIntrTable @ 0x2003060 + +.space 0x8060 + +ds gUnknown_0200B0C0 @ 0x200B0C0 diff --git a/asm/macros.inc b/asm/macros.inc index 75ebd12..40605d2 100755 --- a/asm/macros.inc +++ b/asm/macros.inc @@ -1 +1,2 @@ + .include "asm/macros/function.inc" .include "asm/macros/label.inc" diff --git a/asm/macros/function.inc b/asm/macros/function.inc new file mode 100755 index 0000000..b109595 --- /dev/null +++ b/asm/macros/function.inc @@ -0,0 +1,29 @@ + .macro arm_func_start name + .align 2, 0 + .global \name + .arm + .type \name, %function + .endm + + .macro arm_func_end name + .size \name, .-\name + .endm + + .macro thumb_func_start name + .align 2, 0 + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro non_word_aligned_thumb_func_start name + .global \name + .thumb + .thumb_func + .type \name, %function + .endm + + .macro thumb_func_end name + .size \name, .-\name + .endm diff --git a/asm/main.s b/asm/main.s new file mode 100755 index 0000000..54f4dd6 --- /dev/null +++ b/asm/main.s @@ -0,0 +1,6 @@ + .include "asm/macros.inc" + + .syntax unified + + .text + @@ -1,3 +1,3 @@ .text -.incbin "baserom.gba", 0x23C, 0x7FFDC4 +.incbin "baserom.gba", 0x24C, 0x7FFDB4 |