diff options
Diffstat (limited to 'berry_fix/asm')
-rw-r--r-- | berry_fix/asm/loader.s | 6 | ||||
-rw-r--r-- | berry_fix/asm/macros/asm.inc | 12 | ||||
-rw-r--r-- | berry_fix/asm/macros/function.inc | 29 |
3 files changed, 3 insertions, 44 deletions
diff --git a/berry_fix/asm/loader.s b/berry_fix/asm/loader.s index c342e100f..39e0b768a 100644 --- a/berry_fix/asm/loader.s +++ b/berry_fix/asm/loader.s @@ -1,6 +1,6 @@ - .include "asm/macros/asm.inc" - .include "asm/macros/function.inc" - .include "constants/gba_constants.inc" + .include "../asm/macros/asm.inc" + .include "../asm/macros/function.inc" + .include "../constants/gba_constants.inc" .set SIO_ERROR, 0x0040 .set SIO_MULTI_BUSY, 0x0080 diff --git a/berry_fix/asm/macros/asm.inc b/berry_fix/asm/macros/asm.inc deleted file mode 100644 index 4ac003fab..000000000 --- a/berry_fix/asm/macros/asm.inc +++ /dev/null @@ -1,12 +0,0 @@ - .macro inc x - .set \x, \x + 1 - .endm - - .macro enum_start x=0 - .set __enum__, \x - .endm - - .macro enum constant - .equiv \constant, __enum__ - inc __enum__ - .endm diff --git a/berry_fix/asm/macros/function.inc b/berry_fix/asm/macros/function.inc deleted file mode 100644 index b109595df..000000000 --- a/berry_fix/asm/macros/function.inc +++ /dev/null @@ -1,29 +0,0 @@ - .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 |